diff options
| author | jamal <jamrial@gmail.com> | 2012-07-11 22:41:25 -0300 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-07-14 11:47:01 +0200 |
| commit | 3e03f8d8b202b4548c6fb42f66fff4827e724085 (patch) | |
| tree | 6199d379857f2986d7eeeb43703ccaf8dd0dd11f | |
| parent | bd58f00ec150456a7a8b82f0395d5e9e840edae5 (diff) | |
| download | ffmpeg-3e03f8d8b202b4548c6fb42f66fff4827e724085.tar.gz | |
build: Fix documentation dependencies and rules
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | doc/Makefile | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -1255,6 +1255,7 @@ HAVE_LIST=" nanosleep netinet_sctp_h PeekNamedPipe + pod2man poll_h posix_memalign pthread_cancel @@ -1297,6 +1298,7 @@ HAVE_LIST=" sys_time_h sys_videoio_h termios_h + texi2html threads trunc truncf @@ -1784,7 +1786,7 @@ ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' -doc_deps="texi2html" +doc_deps_any="texi2html makeinfo pod2man" # tests @@ -3385,6 +3387,7 @@ enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo +pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man check_header linux/fb.h check_header linux/videodev.h diff --git a/doc/Makefile b/doc/Makefile index b297eaa9d4..37635d0f5f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,10 +12,10 @@ HTMLPAGES = $(PROGS-yes:%=doc/%.html) \ TXTPAGES = doc/fate.txt \ -DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES) -ifdef HAVE_MAKEINFO -DOCS += $(TXTPAGES) -endif +DOCS-$(HAVE_TEXI2HTML) += $(HTMLPAGES) +DOCS-$(HAVE_POD2MAN) += $(MANPAGES) $(PODPAGES) +DOCS-$(HAVE_MAKEINFO) += $(TXTPAGES) +DOCS = $(DOCS-yes) all-$(CONFIG_DOC): documentation @@ -53,11 +53,15 @@ doc/%.1: doc/%.pod $(GENTEXI) $(DOCS): | doc/ +install-man: + +ifdef HAVE_POD2MAN install-progs-$(CONFIG_DOC): install-man install-man: $(MANPAGES) $(Q)mkdir -p "$(MANDIR)/man1" $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" +endif uninstall: uninstall-man |