build: Fallback $docdir to $datarootdir/doc/gettext

Problem reported by Santiago Vila in
<http://lists.gnu.org/archive/html/bug-gettext/2014-05/msg00014.html>.
* gettext-runtime/configure.ac: Adjust $docdir assuming that
AC_PACKAGE_TARNAME is set.
* gettext-tools/configure.ac: Likewise.
* gettext-tools/examples/configure.ac: Likewise.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index a50af2f089356a5a787069428b473e9f27783073..951cd1728a2b85ae1410a239da1141e1a5114efd 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-14  Daiki Ueno  <ueno@gnu.org>
+
+       * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
+       set.
+
 2014-04-22  Daiki Ueno  <ueno@gnu.org>
 
        build: Use git-version-gen intead of version.sh

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index ce4c6b1247b1856f665b2cd74fe43cbaa0147da2..4a1788c919a3c13d39524e3cd7089c426e18693a 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -26,7 +26,7 @@ AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index c806aa7226be011d5fc1ebf081c0d79f697f665c..5e1e514e83dd892c4586399a171a22219aa006c3 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-14  Daiki Ueno  <ueno@gnu.org>
+
+       * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
+       set.
+
 2014-05-12  Daiki Ueno  <ueno@gnu.org>
 
        build: Fix Woe32 cross build

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 232b3d05c83f09ea55aa15fa325a8f2317b57224..650bd311317797815f99d867546f6e999891e577 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -26,7 +26,7 @@ AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index e12692c1b7044a81c8ca457f11b0f6593c092b16..fa0ce04d04d8280059ffce344f6107899d3fb1e4 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-14  Daiki Ueno  <ueno@gnu.org>
+
+       * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is
+       set.
+
 2014-05-06  Daiki Ueno  <ueno@gnu.org>
 
        * Makefile.am (install-data-local): Don't fail if a PO file does

diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 9fefde87e2b09309be1d2c363078dd9d99e4d55e..ff3eaf1c0543645cc02691a3cc95bcaf6edc07cf 100644 (file)
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -25,7 +25,7 @@ AC_CONFIG_AUX_DIR([../../build-aux])
 AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Installation directories.
-test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootdir}/doc/gettext'
 
 AM_PO_SUBDIRS