summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-07-14 11:40:58 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:13:30 +0200
commita235e17414059adfa7a6d7c79aa90a06113c91a4 (patch)
treebf87004abc6d251023adcc866f75047606ef1a6c /m4
parent6d35d9456672d81e0fdcfa99fa37832db693b716 (diff)
downloadexternal_gettext-a235e17414059adfa7a6d7c79aa90a06113c91a4.zip
external_gettext-a235e17414059adfa7a6d7c79aa90a06113c91a4.tar.gz
external_gettext-a235e17414059adfa7a6d7c79aa90a06113c91a4.tar.bz2
Use a different hack for "make distrib" in directories with a configure.ac.
Diffstat (limited to 'm4')
-rw-r--r--m4/fixautomake.m412
1 files changed, 10 insertions, 2 deletions
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index be6bf8b..d23db6a 100644
--- 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