summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2009-05-21 22:00:53 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:16:05 +0200
commitdf183bc3a458b2f0aa456e7a321b51d2434fceda (patch)
tree4f9b4b5a58a5bb6ffedb99dcc2605f6ddb970041 /m4
parentb96e65ba7616570998795274a82ee767912501a1 (diff)
downloadexternal_gettext-df183bc3a458b2f0aa456e7a321b51d2434fceda.zip
external_gettext-df183bc3a458b2f0aa456e7a321b51d2434fceda.tar.gz
external_gettext-df183bc3a458b2f0aa456e7a321b51d2434fceda.tar.bz2
Support automake 1.11.
Diffstat (limited to 'm4')
-rw-r--r--m4/fixautomake.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index 927755a..989220d 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,4 +1,4 @@
-# fixautomake.m4 serial 7 (gettext-0.18)
+# fixautomake.m4 serial 8 (gettext-0.18)
dnl Copyright (C) 2002-2003, 2006, 2009 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
@@ -8,17 +8,17 @@ dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible
-dnl Fix an automake-1.5-1.10.2 bug: the distrib rule is omitted.
+dnl Fix an automake-1.5-1.11 bug: the distrib rule is omitted.
AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
sed -e 's,^#distdir:,distdir:,' < $ac_file > $ac_file.tmp
mv $ac_file.tmp $ac_file
])
-dnl Fix an automake-1.9-1.10.2 bug: the distrib rule is not extensible.
+dnl Fix an automake-1.9-1.11 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