[FFmpeg-cvslog] Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 24 18:40:16 2013 -0300| [eff2edae562096c1e21e8c048392ffe8968181f2] | committer: Michael Niedermayer

Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"

This partially reverts commit c0237d19a0269ff44e909434f1b2b645fad2d281
Some scripts make use of --disable-doc

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=eff2edae562096c1e21e8c048392ffe8968181f2
---

 configure    |    2 ++
 doc/Makefile |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index c581adf..6b0375b 100755
--- a/configure
+++ b/configure
@@ -1228,6 +1228,7 @@ EXTERNAL_LIBRARY_LIST="
 "
 
 DOCUMENT_LIST="
+    doc
     htmlpages
     manpages
     podpages
@@ -2294,6 +2295,7 @@ podpages_deps="perl"
 manpages_deps="perl pod2man"
 htmlpages_deps="texi2html"
 txtpages_deps="makeinfo"
+doc_deps_any="manpages htmlpages podpages txtpages"
 
 # default parameters
 
diff --git a/doc/Makefile b/doc/Makefile
index 405f639..50a68b4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -36,8 +36,9 @@ DOCS-$(CONFIG_MANPAGES)  += $(MANPAGES)
 DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
 DOCS = $(DOCS-yes)
 
+all-$(CONFIG_DOC): doc
+
 doc: documentation
-all: $(DOCS)
 
 apidoc: doc/doxy/html
 documentation: $(DOCS)
@@ -94,7 +95,7 @@ install-html:
 install-man:
 
 ifdef CONFIG_HTMLPAGES
-install-progs: install-html
+install-progs-$(CONFIG_DOC): install-html
 
 install-html: $(HTMLPAGES)
 	$(Q)mkdir -p "$(DOCDIR)"
@@ -102,7 +103,7 @@ install-html: $(HTMLPAGES)
 endif
 
 ifdef CONFIG_MANPAGES
-install-progs: install-man
+install-progs-$(CONFIG_DOC): install-man
 
 install-man: $(MANPAGES)
 	$(Q)mkdir -p "$(MANDIR)/man1"