diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-05-22 00:27:51 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-05-22 00:27:51 +0200 |
| commit | 73d06ef720e6f6b4b31583836b0c80516a54ca67 (patch) | |
| tree | 0ab026686a2bfb84b7039c12ddefe5a0a1e380f4 /m4 | |
| parent | a5d1310ba89b6516620cbf8f1efcbb5349f116a7 (diff) | |
| download | libunistring-73d06ef720e6f6b4b31583836b0c80516a54ca67.tar.gz | |
Add support for automake 1.11.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/fixautomake.m4 | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4 index bf82d76..989220d 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 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 dnl Public License, this file may be distributed as part of a program @@ -8,31 +8,19 @@ 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.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 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 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 -]) |