diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-05-21 21:08:13 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:16:05 +0200 |
| commit | b96e65ba7616570998795274a82ee767912501a1 (patch) | |
| tree | 35b232a568cc414a19193c51a04d8e42f6ddeae8 /m4 | |
| parent | 0c2ad4029d93f75e98688932f62a7f5ecc3bcd00 (diff) | |
| download | external_gettext-b96e65ba7616570998795274a82ee767912501a1.zip external_gettext-b96e65ba7616570998795274a82ee767912501a1.tar.gz external_gettext-b96e65ba7616570998795274a82ee767912501a1.tar.bz2 | |
Assume automake >= 1.10.2.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/fixautomake.m4 | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4 index bf82d76..927755a 100644 --- a/m4/fixautomake.m4 +++ b/m4/fixautomake.m4 @@ -1,5 +1,5 @@ -# fixautomake.m4 serial 6 (gettext-0.16) -dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc. +# fixautomake.m4 serial 7 (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 dnl Public License, this file may be distributed as part of a program @@ -8,19 +8,13 @@ dnl the same distribution terms as the rest of that program. 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)/'\`\\\$<,\\\$<," < $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. +dnl Fix an automake-1.5-1.10.2 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 bug: the distrib rule is not extensible. +dnl Fix an automake-1.9-1.10.2 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], [ @@ -30,9 +24,3 @@ AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [ sed -e "$sed_script" < $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 - mv $ac_file.tmp $ac_file -]) |