diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/faq/Makefile.am | 11 | ||||
| -rw-r--r-- | doc/hackersguide/Makefile.am | 10 |
4 files changed, 33 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index a4a6e8348..41155d370 100644 --- a/configure.ac +++ b/configure.ac @@ -2345,6 +2345,26 @@ AM_CONDITIONAL(HAVE_ARMV4L, test "x$enable_armv4l" = "xyes") dnl --------------------------------------------- +dnl Use features of autoconf 2.61, but stay compatible +dnl with older versions. +dnl --------------------------------------------- + +if test "x$datarootdir" = "x"; then + datarootdir='${datadir}' + AC_SUBST(datarootdir) +fi + +if test "x$docdir" = "x"; then + docdir='${datarootdir}/doc/${PACKAGE}' + AC_SUBST(docdir) +fi + +if test "x$htmldir" = "x"; then + htmldir='${docdir}' + AC_SUBST(htmldir) +fi + +dnl --------------------------------------------- dnl XINE_ROOTDIR does not work if architecture independent files are dnl installed to another place than architecture dependent files !!! dnl --------------------------------------------- @@ -2418,12 +2438,12 @@ AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) dnl Where aclocal m4 files should be installed -XINE_ACFLAGS="-I `makeexpand "${datarootdir:-${datadir}}/aclocal"`" +XINE_ACFLAGS="-I `makeexpand "${datarootdir}/aclocal"`" AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.]) AC_SUBST(XINE_ACFLAGS) dnl Where architecture independent data (e.g. logo) will/should be installed -XINE_DATADIR="`makeexpand "${datarootdir:-${datadir}}/xine"`" +XINE_DATADIR="`makeexpand "${datarootdir}/xine"`" AC_SUBST(XINE_DATADIR) dnl Where scripts will/should be installed. diff --git a/doc/Makefile.am b/doc/Makefile.am index af97e86b2..0f6e6fb5d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,15 +2,13 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = man hackersguide faq -docs_DATA = README README.dvb README.dxr3 \ +doc_DATA = README README.dvb README.dxr3 \ README.freebsd README.irix README.network_dvd README.opengl \ README.solaris README.syncfb README_xxmc.html README.MINGWCROSS \ README.WIN32 EXTRA_DIST = $(docs_DATA) -docsdir = $(prefix)/share/doc/xine - docs clean-docs: @cd faq && $(MAKE) $@ @cd hackersguide && $(MAKE) $@ diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 3dcbe44e5..6090fd272 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,12 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -docs_DATA = faq.html faq.txt +doc_DATA = faq.txt +html_DATA = faq.html -EXTRA_DIST = README faq.sgml $(docs_DATA) +EXTRA_DIST = README faq.sgml $(doc_DATA) $(html_DATA) -docsdir = $(prefix)/share/doc/xine/faq - -docs: $(docs_DATA) +docs: $(doc_DATA) $(html_DATA) distclean-local: clean-docs @@ -16,7 +15,7 @@ docs-prepare: $(srcdir)/faq.sgml fi clean-docs: - rm -f $(docs_DATA) + rm -f $(doc_DATA) $(html_DATA) test "x$(srcdir)" = x. || rm -f faq.sgml dist-hook: diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 086b7a67a..02a433299 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -12,15 +12,15 @@ hackersguide_fig = architecture.fig \ overlays.fig \ post_frame.fig -docs_DATA = hackersguide.html \ +hackersguide_DATA = hackersguide.html \ architecture.png library.png overlays.png post_frame.png EXTRA_DIST = README $(hackersguide_sgml) $(hackersguide_fig) \ - $(docs_DATA) + $(hackersguide_DATA) -docsdir = $(prefix)/share/doc/xine/hackersguide +hackersguidedir = $(htmldir)/hackersguide -docs: $(docs_DATA) +docs: $(hackersguide_DATA) distclean-local: clean-docs @@ -32,7 +32,7 @@ docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml)) fi clean-docs: - rm -f $(docs_DATA) + rm -f $(hackersguide_DATA) test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml) *.fig dist-hook: |