Define docdir already in configure.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 2b78774d8381a50af2b53c777030659c1f8f0b7d..1976b7ff171de7a7b3ca147cd4d12330997c574c 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (docdir): New variable.
+
 2003-11-04  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (MAKEINFO): Set LC_MESSAGES and LC_ALL to empty as well.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 6efa64c1261ca743ee25b6c1972f7a05e82755a6..72d3ea5a680dff412e0ecb69138c66e003210f26 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -26,6 +26,7 @@ AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER)
 AM_CONFIG_HEADER(config.h)
 
 dnl Installation directories.
+AC_SUBST([docdir], ['${datadir}/doc/gettext'])
 dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
 test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
 

diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog
index 2b8723069c31b3871657e9f3475c2cf917c552e1..29d1d66db81a9d8b41216439df3efab8c56108f5 100644 (file)
--- a/gettext-runtime/intl-java/ChangeLog
+++ b/gettext-runtime/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (docdir): Use the value from the configure script.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index e0f41621ddfe1b60e49eb599ba575850af4f3522..33a8007c9e4de6096428b90b310fb4e3486b9aef 100644 (file)
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES =
 RM = rm -f
 
 jardir = $(datadir)/gettext
-docdir = $(datadir)/doc/gettext
+docdir = @docdir@
 htmldir = $(docdir)
 
 JAR = @JAR@

diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index b620b8567c6e5ea8d8cff7b3ee3d16cbab214796..24477a1b385875451a304949985e3b660985ce20 100644 (file)
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (docdir): Use the value from the configure script.
+
 2003-09-13  Bruno Haible  <bruno@clisp.org>
 
        * envsubst.x: New file.

diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index 8bbcdd2fb40869459902c23aaeed1c053c94ac74..13f8b42ee285772dd1dbadb125cf6324a23db37d 100644 (file)
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -19,7 +19,7 @@
 
 VERSION = @VERSION@
 mandir = @mandir@
-docdir = $(datadir)/doc/gettext
+docdir = @docdir@
 htmldir = $(docdir)
 
 localedir = $(datadir)/locale

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index adf0dec65e9ed017f6f8e378adfff26c7c5a265b..fa4ad1cefa3d679ad5bb2d6e36a1762635ae8da9 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (docdir): New variable.
+
 2003-11-05  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (localedir): New variable.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index bf7bcbb9967d109e1c7507a0c46203e2a62001d5..7468bfa71e6adff3533845ecc268637e618bc851 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -27,6 +27,7 @@ AM_CONFIG_HEADER(config.h)
 
 dnl Installation directories.
 AC_SUBST([localedir], ['${datadir}/locale'])
+AC_SUBST([docdir], ['${datadir}/doc/gettext'])
 dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
 test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
 

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 0ba0158501617a7d04dc554c29a5262b89c73fe1..282a1b6f85b250a6c20f3a2bd8d5fcbf1d92db8f 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (docdir): Use the value from the configure script.
+
 2003-11-13  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (About gettext): Mention OpenI18N (ex-Li18nux).

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 50b209730eaa92e2cbaa9c6cccb8a7085d086a74..377653c6c8ad4a552b073e338be4ff0a63d53200 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-docdir = $(datadir)/doc/gettext
+docdir = @docdir@
 dvidir = $(docdir)
 psdir = $(docdir)
 pdfdir = $(docdir)

diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index 43447fa5a64bbf36b0fa39a96a557fbf7c107d88..857dc2aefedc78a1b52319767ffad59749906222 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (docdir): Use the value from the configure script.
+
 2003-05-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.12.1 released.

diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index f44ec4c9707a0a446f06c2fdfc9182f79dd67b71..a9406ed56bef69cda7f19b9bfc460c453423f578 100644 (file)
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -19,7 +19,7 @@
 
 VERSION = @VERSION@
 mandir = @mandir@
-docdir = $(datadir)/doc/gettext
+docdir = @docdir@
 htmldir = $(docdir)
 
 localedir = $(datadir)/locale