They were installed in $(datadir)/X11/doc. This is not the appropriate location for documents. If a distro/OS has a reason for installating them in $(datadir) they can configure with --docdir=DOCDIR which removes the need for a custom configure option.
Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 3 +-- configure.ac | 9 --------- sgml/Makefile.am | 2 +- sgml/fonts/Makefile.am | 2 +- sgml/graphics/Makefile.am | 2 +- sgml/input/Makefile.am | 2 +- sgml/platforms/Makefile.am | 2 +- sgml/security/Makefile.am | 2 +- 8 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index bd994c0..dd3e2aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,8 @@ # Process this file with autoconf to create configure. SUBDIRS = man sgml -x11docdir = @X11DOCDIR@ -dist_x11doc_DATA = MAINTAINERS +dist_doc_DATA = MAINTAINERS MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index b68126e..7f6141b 100644 --- a/configure.ac +++ b/configure.ac @@ -38,15 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS XORG_ENABLE_DOCS - -DEFAULT_X11DOCDIR=${datadir}/X11/doc -AC_ARG_WITH(x11docdir, - AC_HELP_STRING([--with-x11docdir=<path>], - [Where to install X11 docs (default: ${datadir}/X11/doc)]), - [X11DOCDIR="$withval"], - [X11DOCDIR="$DEFAULT_X11DOCDIR"]) -AC_SUBST([X11DOCDIR]) - XORG_CHECK_DOCBOOK AC_CONFIG_FILES([Makefile diff --git a/sgml/Makefile.am b/sgml/Makefile.am index 4c10b52..11f6fc3 100644 --- a/sgml/Makefile.am +++ b/sgml/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS = fonts graphics input platforms security -x11docdir = @X11DOCDIR@ +x11docdir = $(docdir) SGML_FILES = \ Install.sgml \ LICENSE.sgml \ diff --git a/sgml/fonts/Makefile.am b/sgml/fonts/Makefile.am index e83dde7..36392d6 100644 --- a/sgml/fonts/Makefile.am +++ b/sgml/fonts/Makefile.am @@ -1,5 +1,5 @@ # Process this file with automake to create Makefile.in -x11docdir = @X11DOCDIR@/fonts +x11docdir = $(docdir)/fonts SGML_FILES = fonts.sgml include $(top_srcdir)/sgmlrules.in diff --git a/sgml/graphics/Makefile.am b/sgml/graphics/Makefile.am index c8c0f56..0c58c84 100644 --- a/sgml/graphics/Makefile.am +++ b/sgml/graphics/Makefile.am @@ -1,5 +1,5 @@ # Process this file with automake to create Makefile.in -x11docdir = @X11DOCDIR@/graphics +x11docdir = $(docdir)/graphics SGML_FILES = dps.sgml include $(top_srcdir)/sgmlrules.in diff --git a/sgml/input/Makefile.am b/sgml/input/Makefile.am index 78b2948..226c217 100644 --- a/sgml/input/Makefile.am +++ b/sgml/input/Makefile.am @@ -1,5 +1,5 @@ # Process this file with automake to create Makefile.in -x11docdir = @X11DOCDIR@/input +x11docdir = $(docdir)/input SGML_FILES = XKB-Config.sgml XKB-Enhancing.sgml include $(top_srcdir)/sgmlrules.in diff --git a/sgml/platforms/Makefile.am b/sgml/platforms/Makefile.am index c926911..9aebd3c 100644 --- a/sgml/platforms/Makefile.am +++ b/sgml/platforms/Makefile.am @@ -1,6 +1,6 @@ # Process this file with automake to create Makefile.in -x11docdir = @X11DOCDIR@/platforms +x11docdir = $(docdir)/platforms SGML_FILES = \ Darwin.sgml \ NetBSD.sgml \ diff --git a/sgml/security/Makefile.am b/sgml/security/Makefile.am index 01a95ff..70e2164 100644 --- a/sgml/security/Makefile.am +++ b/sgml/security/Makefile.am @@ -1,5 +1,5 @@ # Process this file with automake to create Makefile.in -x11docdir = @X11DOCDIR@/security +x11docdir = $(docdir)/security SGML_FILES = XACE-Spec.sgml include $(top_srcdir)/sgmlrules.in -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
