Commit 754e21b5 authored by Ron's avatar Ron

Respect the configure --docdir override

Patch from RedDwarf, Closes ticket:1758 (for oggz).

There is more that could be done here, right now the install-data target
installs everything that doxygen generates into $docdir, which with the
current doxygen configuration includes both html and latex docs, the
latter of which aren't actually in a user-presentable form without doing
a further build of them to convert to the desired format.

Probably the html docs should be installed to htmldir, and the latex
docs should not be installed at all in their current form.  If people
do use the latter, then adding top level targets to fully generate
them wouldn't be the silliest thing to do, and then they should be
installed to dvidir/pdfdir/psdir as appropriate.

But so far, being able to alter $docdir is all that was asked for, and
this patch does exactly that.  The rest can wait for someone with the
right itch for now.
parent a9ad66f8
......@@ -466,7 +466,7 @@ else
AS_AC_EXPAND(LIBDIR, ${libdir})
AS_AC_EXPAND(INCLUDEDIR, ${includedir})
AS_AC_EXPAND(BINDIR, ${bindir})
AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
AS_AC_EXPAND(DOCDIR, ${docdir})
AC_SUBST(BINDIR)
......@@ -513,7 +513,7 @@ AC_MSG_RESULT([
liboggz: ..................... ${LIBDIR}
Tools: ....................... ${BINDIR}
C header files: .............. ${INCLUDEDIR}/oggz
Documentation: ............... ${DOCDIR}/$PACKAGE
Documentation: ............... ${DOCDIR}
Building:
......
docdir=$(prefix)/share/doc/@PACKAGE@
man_MANS = oggz.1 oggz-diff.1 oggz-dump.1 oggz-info.1 oggz-known-codecs.1 oggz-merge.1 oggz-chop.1 \
oggz-sort.1 oggz-rip.1 oggz-comment.1 oggz-scan.1 oggz-validate.1 oggz-codecs.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment