From: Bruno Haible <bruno@clisp.org>
Date: Thu, 13 Nov 2003 15:35:40 +0000 (+0000)
Subject: Define docdir already in configure.
X-Git-Tag: v0.13~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cad39a7e624dfd38bd6fb3a41d05383d82368712;p=thirdparty%2Fgettext.git

Define docdir already in configure.
---

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 2b78774d8..1976b7ff1 100644
--- 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 6efa64c12..72d3ea5a6 100644
--- 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 2b8723069..29d1d66db 100644
--- 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 e0f41621d..33a8007c9 100644
--- 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 b620b8567..24477a1b3 100644
--- 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 8bbcdd2fb..13f8b42ee 100644
--- 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 adf0dec65..fa4ad1cef 100644
--- 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 bf7bcbb99..7468bfa71 100644
--- 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 0ba015850..282a1b6f8 100644
--- 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 50b209730..377653c6c 100644
--- 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 43447fa5a..857dc2aef 100644
--- 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 f44ec4c97..a9406ed56 100644
--- 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