diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gettext-tools/examples/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | gettext-tools/examples/configure.ac | 2 | ||||
| -rw-r--r-- | m4/fixautomake.m4 | 12 |
5 files changed, 21 insertions, 5 deletions
@@ -1,5 +1,9 @@ 2006-07-13 Bruno Haible <bruno@clisp.org> + * m4/fixautomake.m4 (FIX_MAKEFILE_TOPDIR_DISTRIB): New macro. + +2006-07-13 Bruno Haible <bruno@clisp.org> + * Makefile.am (SUBDIRS): Put autoconf-lib-link last. 2006-06-29 Bruno Haible <bruno@clisp.org> diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index b332d21..e8eac58 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,5 +1,10 @@ 2006-07-13 Bruno Haible <bruno@clisp.org> + * configure.ac (Makefile): Invoke FIX_MAKEFILE_TOPDIR_DISTRIB instead + of FIX_MAKEFILE_DISTRIB. + +2006-07-13 Bruno Haible <bruno@clisp.org> + * hello-c++-kde/admin/cvs.sh: Disable the search for specific versions of autoconf, autoheader, autom4te, automake, aclocal. Accept autoconf, autoheader versions > 2.59. Accept automake diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am index 0f45b66..1db7ef2 100644 --- a/gettext-tools/examples/Makefile.am +++ b/gettext-tools/examples/Makefile.am @@ -1100,8 +1100,7 @@ uninstall-local: rm -f $(DESTDIR)$(examplesdir)/$$f; \ done -# Hidden from automake, but really activated. Works around an automake-1.5 bug. -#distdir: distdir1 +# Invoked from inside automake's distdir target. distdir1: cd po && $(MAKE) update-po for file in $(EXAMPLESFILES); do \ diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac index 112f514..48e27f2 100644 --- a/gettext-tools/examples/configure.ac +++ b/gettext-tools/examples/configure.ac @@ -33,7 +33,7 @@ aclocaldir='${datadir}/aclocal' AC_SUBST(aclocaldir) AC_CONFIG_FILES([Makefile], - [FIX_MAKEFILE_DISTRIB]) + [FIX_MAKEFILE_TOPDIR_DISTRIB]) AC_CONFIG_FILES([installpaths]) AC_CONFIG_FILES([po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE]) 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 |