Use dist-hook instead of old distdir hack.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 75c202ed54a945882483dad9bb872d059865a50c..f5a573be32e0caa99f04b3b4995d3610e9db7186 100644 (file)
--- 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 f454305b6635eba593d73b587af80f88f1704022..1451ec3a7f538cff2c9b10fd6ca239bd59e465dd 100644 (file)
--- 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 5198fb50dc223d19e15659c3ddc5f1dc9d55b954..c58c4c9953d092faede2bcdac3dc712c0e477239 100644 (file)
--- 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