From 0793877631bd889673fccb847a329d301db9c78c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 14 May 2014 08:09:41 +0900 Subject: [PATCH] build: Fallback $docdir to $datarootdir/doc/gettext Problem reported by Santiago Vila in . * gettext-runtime/configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is set. * gettext-tools/configure.ac: Likewise. * gettext-tools/examples/configure.ac: Likewise. --- gettext-runtime/ChangeLog | 5 +++++ gettext-runtime/configure.ac | 2 +- gettext-tools/ChangeLog | 5 +++++ gettext-tools/configure.ac | 2 +- gettext-tools/examples/ChangeLog | 5 +++++ gettext-tools/examples/configure.ac | 2 +- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index a50af2f08..951cd1728 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,8 @@ +2014-05-14 Daiki Ueno + + * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is + set. + 2014-04-22 Daiki Ueno build: Use git-version-gen intead of version.sh diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index ce4c6b124..4a1788c91 100644 --- 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 c806aa722..5e1e514e8 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2014-05-14 Daiki Ueno + + * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is + set. + 2014-05-12 Daiki Ueno build: Fix Woe32 cross build diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 232b3d05c..650bd3113 100644 --- 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 e12692c1b..fa0ce04d0 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,8 @@ +2014-05-14 Daiki Ueno + + * configure.ac: Adjust $docdir assuming that AC_PACKAGE_TARNAME is + set. + 2014-05-06 Daiki Ueno * 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 9fefde87e..ff3eaf1c0 100644 --- 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 -- 2.47.3