Assume automake-1.4-p5 now.

diff --git a/ChangeLog b/ChangeLog
index ed72ebfe92066266b0df29bb9caf8ba134c0f864..cee016af37410f1109a78061b19890843c574567 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-26  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in (configure.in): Remove automake bug workarounds, not
+       needed anymore with automake-1.4-p5.
+
 2001-07-22  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in (ALL_LINGUAS): Remove assignment.

diff --git a/configure.in b/configure.in
index a063fcb499bb119e481f1dd0369ed016f2f04088..5199bf5ff34f165baca270bc5dbe131ae9f04b09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.13)
-AC_REVISION($Revision: 1.37 $)
+AC_REVISION($Revision: 1.38 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.11)
 RELEASE_DATE=2001-05-23      dnl in "date +%Y-%m-%d" format
@@ -106,22 +106,4 @@ EOF
 
 AC_OUTPUT([Makefile lib/Makefile intl/Makefile src/Makefile po/Makefile.in \
            doc/Makefile man/Makefile tests/Makefile m4/Makefile \
-          misc/Makefile misc/gettextize], [
-  dnl Workaround an automake-1.4 bug which generates a distclean-recursive
-  dnl target in Makefile.in which causes a "make distclean" failure on FreeBSD.
-changequote(,)dnl
-  sed -e 's/test \([^ ]*\) = \([^ ]*\) \&\& /test \1 != \2 \|\| /' < Makefile \
-      > Makefile.tmp
-changequote([, ])dnl
-  mv Makefile.tmp Makefile
-  dnl Workaround an automake-1.4 bug which generates an incorrect uninstall
-  dnl target in misc/Makefile.in.
-  sed -e 's/rm -f \$(lispdir)/rm -f \$(DESTDIR)\$(lispdir)/' < misc/Makefile \
-      > misc/Makefile.tmp
-  mv misc/Makefile.tmp misc/Makefile
-  dnl Workaround another automake-1.4 bug which generates incorrect install
-  dnl and uninstall targets in misc/Makefile.in.
-  sed -e "s/list='\\\$(lisp_LISP)'; for/list='\$(lisp_LISP)'; test '\$(EMACS)' = no || for/" \
-      < misc/Makefile > misc/Makefile.tmp
-  mv misc/Makefile.tmp misc/Makefile
-])
+           misc/Makefile misc/gettextize])

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 885d8bf73ed1e85c8bb278bc0c3c7754e9faf48b..6128a4aa1f133660d254292afa6b971fb7bce03e 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-26  Bruno Haible  <haible@clisp.cons.org>
+
+       * automake.diff: Update for automake-1.4-p5.
+
 2001-08-01  François Pinard  <pinard@iro.umontreal.ca>
 
        * po-mode.el: Optimize testing for XEmacs.

diff --git a/misc/automake.diff b/misc/automake.diff
index f6850cacc8c4000cba9c9da077be1b42ab5157ce..f7aaaf36f121a1595358de87dc007d3bd6cbcf04 100644 (file)
--- a/misc/automake.diff
+++ b/misc/automake.diff
@@ -1,19 +1,19 @@
-*** automake.bak       Sun Jun 10 16:24:20 2001
---- automake   Sun Jul 22 16:51:04 2001
+*** automake.bak       Thu Jul 26 13:12:18 2001
+--- automake   Thu Jul 26 13:17:36 2001
 ***************
-*** 3313,3319 ****
+*** 3362,3368 ****
       }
       else
       {
-!      &am_error ("AM_GNU_GETTEXT in configure.in but \`ALL_LINGUAS' not defined");
+!      &am_error ("AM_GNU_GETTEXT in \`$configure_ac' but \`ALL_LINGUAS' not defined");
       }
   }
   
---- 3313,3320 ----
+--- 3362,3369 ----
       }
       else
       {
-!      &am_error ("AM_GNU_GETTEXT in configure.in but po/LINGUAS doesn't exist and \`ALL_LINGUAS' not defined")
+!      &am_error ("AM_GNU_GETTEXT in \`$configure_ac' but po/LINGUAS doesn't exist and \`ALL_LINGUAS' not defined")
 !          if ! -f "po/LINGUAS";
       }
   }