Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

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

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 035fb8abb8acfeefe245fe7627a19e000b39773f,11005ab320faa0a725be005c77030ce05ea67292..6767c6ac369936dcb2dfce88c4812c95d1b9c453
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -78,10 -78,10 +78,11 @@@ Help options
  Standard options:
    --logfile=FILE           log tests and output to FILE [config.log]
    --disable-logging        do not log configure debug information
 +  --fatal-warnings         fail if any configure warning is generated
    --prefix=PREFIX          install in PREFIX [$prefix]
    --bindir=DIR             install binaries in DIR [PREFIX/bin]
 -  --datadir=DIR            install data files in DIR [PREFIX/share/avconv]
 -  --docdir=DIR             install documentation in DIR [PREFIX/share/doc/libav]
 +  --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]
    --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]
    --incdir=DIR             install includes in DIR [PREFIX/include]
@@@ -2269,7 -1956,8 +2271,8 @@@ logfile="config.log
  # installation paths
  prefix_default="/usr/local"
  bindir_default='${prefix}/bin'
 -datadir_default='${prefix}/share/avconv'
 -docdir_default='${prefix}/share/doc/libav'
 +datadir_default='${prefix}/share/ffmpeg'
++docdir_default='${prefix}/share/doc/ffmpeg'
  incdir_default='${prefix}/include'
  libdir_default='${prefix}/lib'
  mandir_default='${prefix}/share/man'
@@@ -4683,11 -4122,9 +4686,12 @@@ SHLIBDIR=\$(DESTDIR)$shlibdi
  INCDIR=\$(DESTDIR)$incdir
  BINDIR=\$(DESTDIR)$bindir
  DATADIR=\$(DESTDIR)$datadir
+ DOCDIR=\$(DESTDIR)$docdir
  MANDIR=\$(DESTDIR)$mandir
  SRC_PATH=$source_path
 +ifndef MAIN_MAKEFILE
 +SRC_PATH:=\$(SRC_PATH:.%=..%)
 +endif
  CC_IDENT=$cc_ident
  ARCH=$arch
  CC=$cc

diff --cc doc/Makefile
index cd24b8c597edb35588b9f48d5643d09a4d33970c,81f098e0b3f6166e1cf26fa95f3bcab85c0d3651..8452ce3e12a314e9bd1f3cab8b7471b9f79c6273
--- 1/doc/Makefile
--- 2/doc/Makefile
+++ b/doc/Makefile
@@@ -88,31 -45,26 +88,38 @@@ $(DOCS) doc/doxy/html: | doc
  doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
        $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
  
- install-progs-$(CONFIG_DOC): install-man
 +install-man:
 +
 +ifdef CONFIG_MANPAGES
+ install-progs-$(CONFIG_DOC): install-doc install-man
+ 
+ install-doc: $(HTMLPAGES)
+       $(Q)mkdir -p "$(DOCDIR)"
+       $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
  
  install-man: $(MANPAGES)
        $(Q)mkdir -p "$(MANDIR)/man1"
 -      $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 +      $(INSTALL) -m 644 $(MANPAGES1) "$(MANDIR)/man1"
 +      $(Q)mkdir -p "$(MANDIR)/man3"
 +      $(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
 +endif
  
- uninstall: uninstall-man
+ uninstall: uninstall-doc uninstall-man
+ 
+ uninstall-doc:
+       $(RM) -r "$(DOCDIR)"
  
  uninstall-man:
 -      $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 +      $(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES1))
 +      $(RM) $(addprefix "$(MANDIR)/man3/",$(MANPAGES3))
 +
 +clean:: docclean
 +
 +distclean:: docclean
 +      $(RM) doc/config.texi
  
 -clean::
 -      $(RM) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
 +docclean:
 +      $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
        $(RM) -r doc/doxy/html
  
  -include $(wildcard $(DOCS:%=%.d))