Fix for automake-1.10.

diff --git a/ChangeLog b/ChangeLog
index 5ea653ca942d0ade61eeb5594ce231e0333277c9..4357a70494d94264fe24074c777fdaa4eeb02652 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-23  Bruno Haible  <bruno@clisp.org>
+
+       * m4/fixautomake.m4 (FIX_MAKEFILE_TOPDIR_DISTRIB): Make it work with
+       automake-1.10 too.
+
 2006-10-20  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh: Don't remove gettext-tools/libgettextpo/gnulib-m4.

diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index 60c480347122b541d74feb64efa6c73bdd53d320..7a401558181e889c8db7fa2c504dc8e4ede7aa54 100644 (file)
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,4 +1,4 @@
-# fixautomake.m4 serial 5 (gettext-0.15.1)
+# fixautomake.m4 serial 6 (gettext-0.15.1)
 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
@@ -20,11 +20,11 @@ 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 Fix an automake-1.9-1.10 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_script='/^       mkdir \$(distdir)$/{a\
+  sed_script='/mkdir \$(distdir)$/{a\
 \      $(MAKE) distdir1
 }'
   sed -e "$sed_script" < $ac_file > $ac_file.tmp