No need to pass an argument to the FIX_MAKEFILE_* macros.

diff --git a/ChangeLog b/ChangeLog
index 73516171992d1403de099638ac2f3582e663bbff..df9c3f6346062d45da5057864cc0c7b0c073e44f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Bruno Haible  <bruno@clisp.org>
+
+       * config/m4/fixautomake.m4 (FIX_MAKEFILE_COMPILE, FIX_MAKEFILE_DISTRIB,
+       FIX_MAKEFILE_INFO): Drop argument, use $ac_file instead.
+
 2003-09-13  Bruno Haible  <bruno@clisp.org>
 
        * PACKAGING: Add envsubst related files and gettext.sh.

diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index c2b9440f6043d2521062ca030ed93b39addbb77e..afda4d776f474722e481947b6b8ce6f6a51701b3 100644 (file)
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-31  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Remove argument of FIX_MAKEFILE_DISTRIB.
+
 2003-06-17  Paul Eggert  <eggert@twinsun.com>
 
        * config.rpath: Use grep instead of egrep, since POSIX 1003.1-2001 no

diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac
index 889fbd826ba6c20760a99371ab0f609f491b2439..aad426e3f56b14ffea49608286c4d12cc7237502 100644 (file)
--- a/autoconf-lib-link/configure.ac
+++ b/autoconf-lib-link/configure.ac
@@ -58,7 +58,7 @@ aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)
 
 AC_CONFIG_FILES([Makefile],
-                [FIX_MAKEFILE_DISTRIB([Makefile])])
+                [FIX_MAKEFILE_DISTRIB])
 
 AC_CONFIG_FILES([m4/Makefile])
 

diff --git a/config/m4/fixautomake.m4 b/config/m4/fixautomake.m4
index 0f701700c525428ef28490b45d47d8bd3074f3c2..e8ca6413e91922865c116c34310f3dbdc835d9be 100644 (file)
--- a/config/m4/fixautomake.m4
+++ b/config/m4/fixautomake.m4
@@ -1,4 +1,4 @@
-# fixautomake.m4 serial 2 (gettext-0.12)
+# fixautomake.m4 serial 3 (gettext-0.12.2)
 dnl Copyright (C) 2002-2003 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
@@ -10,18 +10,18 @@ dnl From Bruno Haible
 
 dnl Fix unesthetic build commands generated by automake.
 AC_DEFUN([FIX_MAKEFILE_COMPILE], [
-  sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $1 > $1.tmp
-  mv $1.tmp $1
+  sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $ac_file > $ac_file.tmp
+  mv $ac_file.tmp $ac_file
 ])
 
 dnl Fix an automake-1.5-1.7.2 bug: the distrib rule is omitted.
 AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
-  sed -e 's,^#distdir:,distdir:,' < $1 > $1.tmp
-  mv $1.tmp $1
+  sed -e 's,^#distdir:,distdir:,' < $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' < $1 > $1.tmp
-  mv $1.tmp $1
+  sed -e '/@rm -f \$''@/d' < $ac_file > $ac_file.tmp
+  mv $ac_file.tmp $ac_file
 ])

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 5f98e7da75df2831a0869c05a2d563ffaca5b352..23e9394ee821d851ee8773399dc616a5ccd89312 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-31  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Remove argument of FIX_MAKEFILE_COMPILE.
+
 2003-09-16  Bruno Haible  <bruno@clisp.org>
 
        Portability to SunOS 4.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index feeb88044d0289619427757e38305d5cdc0dcb8e..6efa64c1261ca743ee25b6c1972f7a05e82755a6 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -141,11 +141,11 @@ AC_CONFIG_FILES([intl/Makefile])
 AC_CONFIG_FILES([intl-java/Makefile])
 
 AC_CONFIG_FILES([lib/Makefile],
-                [FIX_MAKEFILE_COMPILE([lib/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 AC_CONFIG_FILES([lib/javacomp.sh:../gettext-tools/lib/javacomp.sh.in])
 
 AC_CONFIG_FILES([src/Makefile],
-                [FIX_MAKEFILE_COMPILE([src/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 
 AC_CONFIG_FILES([po/Makefile.in])
 

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index dbfae8b0e53264bcbbd5396fcc046d495ec865b1..01be736387be26b5cabde39df69826a842fc0e49 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Remove argument of FIX_MAKEFILE_COMPILE,
+       FIX_MAKEFILE_INFO.
+
 2003-10-19  Jim Meyering  <jim@meyering.net>
 
        * vasnprintf.c (VASNPRINTF): Work around losing snprintf on HPUX 10.20.

diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index e4c7f31bdafc20ef7e7d576bbbcbb7a73b73dd93..a5d89950c5a8cdfa1e3580679da10712d27748d4 100644 (file)
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -79,7 +79,7 @@ AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf)
 AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
 
 AC_CONFIG_FILES([Makefile],
-                [FIX_MAKEFILE_COMPILE([Makefile])
-                 FIX_MAKEFILE_INFO([Makefile])])
+                [FIX_MAKEFILE_COMPILE
+                 FIX_MAKEFILE_INFO])
 
 AC_OUTPUT

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index ca544178c99243f57dc7b6a86d6753d101300498..084500d07a3da147d17f3b03d3bb27dd156d6e01 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Remove argument of FIX_MAKEFILE_COMPILE,
+       FIX_MAKEFILE_DISTRIB, FIX_MAKEFILE_INFO.
+
 2003-10-07  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Drop PARAMS definition from config.h.in.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 701fca6fb060977b651d3bf82b773611ccb7826f..880e7223add7abfa99030fa2f8e611d6b0e05190 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -233,9 +233,9 @@ AC_SUBST(LTALLOCA)
 AC_CONFIG_FILES([Makefile])
 
 AC_CONFIG_FILES([doc/Makefile],
-                [FIX_MAKEFILE_COMPILE([doc/Makefile])
-                 FIX_MAKEFILE_DISTRIB([doc/Makefile])
-                 FIX_MAKEFILE_INFO([doc/Makefile])])
+                [FIX_MAKEFILE_COMPILE
+                 FIX_MAKEFILE_DISTRIB
+                 FIX_MAKEFILE_INFO])
 
 AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   # Change srcdir variable so that it points to ../gettext-runtime/intl.
@@ -245,14 +245,14 @@ AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   ])
 
 AC_CONFIG_FILES([lib/Makefile],
-                [FIX_MAKEFILE_COMPILE([lib/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 AC_CONFIG_FILES([lib/javacomp.sh lib/javaexec.sh])
 
 AC_CONFIG_FILES([libuniname/Makefile],
-                [FIX_MAKEFILE_COMPILE([libuniname/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 
 AC_CONFIG_FILES([src/Makefile],
-                [FIX_MAKEFILE_COMPILE([src/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 AC_CONFIG_FILES([src/user-email])
 
 AC_CONFIG_FILES([po/Makefile.in])
@@ -269,6 +269,6 @@ AC_CONFIG_FILES([man/x-to-1])
 AC_CONFIG_FILES([m4/Makefile])
 
 AC_CONFIG_FILES([tests/Makefile],
-                [FIX_MAKEFILE_COMPILE([tests/Makefile])])
+                [FIX_MAKEFILE_COMPILE])
 
 AC_OUTPUT