summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2009-06-06 10:47:18 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:16:07 +0200
commit8f6fcc4f0b5f35452c02b52c0a0d112c768fa016 (patch)
tree47f26df901847653ceade15cfd01546987a2aab2
parent74f085399cf992fb0487f77ec6d72bd07f72d1da (diff)
downloadexternal_gettext-8f6fcc4f0b5f35452c02b52c0a0d112c768fa016.zip
external_gettext-8f6fcc4f0b5f35452c02b52c0a0d112c768fa016.tar.gz
external_gettext-8f6fcc4f0b5f35452c02b52c0a0d112c768fa016.tar.bz2
Use dist-hook instead of old distdir hack.
-rw-r--r--gettext-tools/ChangeLog5
-rw-r--r--gettext-tools/configure.ac3
-rw-r--r--gettext-tools/doc/Makefile.am3
3 files changed, 7 insertions, 4 deletions
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 75c202e..f5a573b 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-31 Bruno Haible <bruno@clisp.org>
+
+ * doc/Makefile.am: Use dist-hook instead of old distdir hack.
+ * configure.ac (doc/Makefile.am): Don't invoke FIX_MAKEFILE_DISTRIB.
+
2009-05-29 Bruno Haible <bruno@clisp.org>
Avoid lang-c++ test failure.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index f454305..1451ec3 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -357,8 +357,7 @@ AC_CONFIG_SUBDIRS([examples])
AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([doc/Makefile],
- [FIX_MAKEFILE_DISTRIB])
+AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
# Change srcdir variable so that it points to ../gettext-runtime/intl.
diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 5198fb5..c58c4c9 100644
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -94,8 +94,7 @@ all-local: html-local
install-data-local: install-html
installdirs-local: installdirs-html
uninstall-local: uninstall-html
-# Hidden from automake, but really activated. Works around an automake-1.5 bug.
-#distdir: dist-html
+dist-hook: dist-html
html-local: html-split
# Override of automake's definition. The HTML files we want to distribute are