virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"

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

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2013-11-24 18:40:16 -03:00 committed by Michael Niedermayer
parent 5e1c57f5cb
commit eff2edae56
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

7
doc/Makefile
View File

@ -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"