Use a different hack for "make distrib" in directories with a configure.ac.

diff --git a/ChangeLog b/ChangeLog
index 08b301f677316613bc4ba0bc1b4b418f3f10c4e1..a214d209904f1ae9d2fc750f292d4251d1a7b445 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-13  Bruno Haible  <bruno@clisp.org>
+
+       * m4/fixautomake.m4 (FIX_MAKEFILE_TOPDIR_DISTRIB): New macro.
+
 2006-07-13  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (SUBDIRS): Put autoconf-lib-link last.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index b332d217609a80cf82a72725ed24b4aa65aa1d51..e8eac58390b59bcde70c95d0c316fbd226bf87fe 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-13  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (Makefile): Invoke FIX_MAKEFILE_TOPDIR_DISTRIB instead
+       of FIX_MAKEFILE_DISTRIB.
+
 2006-07-13  Bruno Haible  <bruno@clisp.org>
 
        * hello-c++-kde/admin/cvs.sh: Disable the search for specific

diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 0f45b6601554aa29bfaa802050ff92b3ab8dce2c..1db7ef2ddaf851e74ba93262584a8a8444250f4b 100644 (file)
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -1100,8 +1100,7 @@ uninstall-local:
          rm -f $(DESTDIR)$(examplesdir)/$$f; \
        done
 
-# Hidden from automake, but really activated. Works around an automake-1.5 bug.
-#distdir: distdir1
+# Invoked from inside automake's distdir target.
 distdir1:
        cd po && $(MAKE) update-po
        for file in $(EXAMPLESFILES); do \

diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 112f514a5639ddb7ecd0decc78128c9c1bfe9a93..48e27f2c9fd0bca2ae5799c10c2fb9b76f6813ac 100644 (file)
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -33,7 +33,7 @@ aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)
 
 AC_CONFIG_FILES([Makefile],
-                [FIX_MAKEFILE_DISTRIB])
+                [FIX_MAKEFILE_TOPDIR_DISTRIB])
 AC_CONFIG_FILES([installpaths])
 AC_CONFIG_FILES([po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE])
 

diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index be6bf8bf80e7be08e48f60e387a4a3818048b797..d23db6aec6647de31983b5964fcfb52bfec6b943 100644 (file)
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,5 +1,5 @@
-# fixautomake.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# fixautomake.m4 serial 4 (gettext-0.15)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -20,6 +20,14 @@ AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
   mv $ac_file.tmp $ac_file
 ])
 
+dnl Fix an automake-1.9 bug: the distrib rule is not extensible.
+dnl Insert a invocation of the distdir1 target inside the distdir commands,
+dnl after $(distdir) has been erased and re-created.
+AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [
+  sed -e '/^   mkdir \$(distdir)$/{a\' -e '    $(MAKE) distdir1' -e '}' < $ac_file > $ac_file.tmp
+  mv $ac_file.tmp $ac_file
+])
+
 dnl Fix an automake-1.5-1.7.2 bug: all info files are erased by "make".
 AC_DEFUN([FIX_MAKEFILE_INFO], [
   sed -e '/@rm -f \$''@/d' < $ac_file > $ac_file.tmp