[FFmpeg-cvslog] doc: fix install-doc dependencies
James Almer
git at videolan.org
Sat Sep 7 21:44:34 CEST 2013
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep 1 19:00:06 2013 -0300| [2df184f3d5afbf7f0f325f85ca8101c524f39adb] | committer: Michael Niedermayer
doc: fix install-doc dependencies
Put it inside its own ifdef conditional.
Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2df184f3d5afbf7f0f325f85ca8101c524f39adb
---
doc/Makefile | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index a9b7ff4..47f5cbe 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -88,15 +88,20 @@ $(DOCS) doc/doxy/html: | doc/
doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+install-doc:
+
install-man:
-ifdef CONFIG_MANPAGES
-install-progs-$(CONFIG_HTMLPAGES): install-doc
-install-progs-$(CONFIG_DOC): install-man
+ifdef CONFIG_HTMLPAGES
+install-progs-$(CONFIG_DOC): install-doc
install-doc: $(HTMLPAGES)
$(Q)mkdir -p "$(DOCDIR)"
$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
+endif
+
+ifdef CONFIG_MANPAGES
+install-progs-$(CONFIG_DOC): install-man
install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1"
More information about the ffmpeg-cvslog
mailing list