highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

Browse Source 
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-01 13:41:33 +02:00
commit d8809b357c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -82,6 +82,7 @@ Standard options:
--prefix=PREFIX install in PREFIX [$prefix] --prefix=PREFIX install in PREFIX [$prefix]
--bindir=DIR install binaries in DIR [PREFIX/bin] --bindir=DIR install binaries in DIR [PREFIX/bin]
--datadir=DIR install data files in DIR [PREFIX/share/ffmpeg] --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg]
--docdir=DIR install documentation in DIR [PREFIX/share/doc/ffmpeg]
--libdir=DIR install libs in DIR [PREFIX/lib] --libdir=DIR install libs in DIR [PREFIX/lib]
--shlibdir=DIR install shared libs in DIR [PREFIX/lib] --shlibdir=DIR install shared libs in DIR [PREFIX/lib]
--incdir=DIR install includes in DIR [PREFIX/include] --incdir=DIR install includes in DIR [PREFIX/include]
@ -1602,6 +1603,7 @@ CMDLINE_SELECT="
PATHS_LIST=' PATHS_LIST='
bindir bindir
datadir datadir
docdir
incdir incdir
libdir libdir
mandir mandir
@ -2270,6 +2272,7 @@ logfile="config.log"
prefix_default="/usr/local" prefix_default="/usr/local"
bindir_default='${prefix}/bin' bindir_default='${prefix}/bin'
datadir_default='${prefix}/share/ffmpeg' datadir_default='${prefix}/share/ffmpeg'
docdir_default='${prefix}/share/doc/ffmpeg'
incdir_default='${prefix}/include' incdir_default='${prefix}/include'
libdir_default='${prefix}/lib' libdir_default='${prefix}/lib'
mandir_default='${prefix}/share/man' mandir_default='${prefix}/share/man'
@ -4683,6 +4686,7 @@ SHLIBDIR=\$(DESTDIR)$shlibdir
INCDIR=\$(DESTDIR)$incdir INCDIR=\$(DESTDIR)$incdir
BINDIR=\$(DESTDIR)$bindir BINDIR=\$(DESTDIR)$bindir
DATADIR=\$(DESTDIR)$datadir DATADIR=\$(DESTDIR)$datadir
DOCDIR=\$(DESTDIR)$docdir
MANDIR=\$(DESTDIR)$mandir MANDIR=\$(DESTDIR)$mandir
SRC_PATH=$source_path SRC_PATH=$source_path
ifndef MAIN_MAKEFILE ifndef MAIN_MAKEFILE

11
doc/Makefile
View File

@ -91,7 +91,11 @@ doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
install-man: install-man:
ifdef CONFIG_MANPAGES ifdef CONFIG_MANPAGES
install-progs-$(CONFIG_DOC): install-man install-progs-$(CONFIG_DOC): install-doc install-man
install-doc: $(HTMLPAGES)
$(Q)mkdir -p "$(DOCDIR)"
$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
install-man: $(MANPAGES) install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1" $(Q)mkdir -p "$(MANDIR)/man1"
@ -100,7 +104,10 @@ install-man: $(MANPAGES)
$(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3" $(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
endif endif
uninstall: uninstall-man uninstall: uninstall-doc uninstall-man
uninstall-doc:
$(RM) -r "$(DOCDIR)"
uninstall-man: uninstall-man:
$(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES1)) $(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES1))