From: Bruno Haible <bruno@clisp.org>
Date: Fri, 2 May 2003 09:34:39 +0000 (+0000)
Subject: 'automake' now comes after 'aclocal'.
X-Git-Tag: v0.12~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4b3871fd4a10e7960bb0718647fddbb284ce39d;p=thirdparty%2Fgettext.git

'automake' now comes after 'aclocal'.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 67c82a283..83efd1446 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-29  Bruno Haible  <bruno@clisp.org>
+
+	* gettextize.in: Recommend running automake only after aclocal,
+	because automake 1.7 assumes that aclocal.m4 has already been built.
+
 2003-04-12  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms: Avoid rules with no lines. Don't use the force target.
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 8d3d5d2db..92f073b62 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -734,18 +734,6 @@ if test -f "$srcdir/Makefile.am"; then
     fi
   fi
   $do_changelog && func_m4ChangeLog_finish
-  # Also create $m4dir/Makefile.in from $m4dir/Makefile.am, because automake
-  # doesn't do it by itself.
-  if $doit; then
-    case "$added_acoutput" in
-      *" $m4dir/Makefile")
-        (cd "$srcdir" && automake "$m4dir/Makefile") 2>/dev/null ||
-        please="$please
-Please run 'automake $m4dir/Makefile' to create $m4dir/Makefile.in
-"
-        ;;
-    esac
-  fi
 
   # Update the top-level Makefile.am.
   modified_Makefile_am=
@@ -843,6 +831,19 @@ Please run 'aclocal -I $m4dir' to regenerate the aclocal.m4 file.
 You need aclocal from GNU automake 1.5 (or newer) to do this.
 Then run 'autoconf' to regenerate the configure file.
 "
+
+  # Also create $m4dir/Makefile.in from $m4dir/Makefile.am, because automake
+  # doesn't do it by itself.
+  if $doit; then
+    case "$added_acoutput" in
+      *" $m4dir/Makefile")
+        (cd "$srcdir" && automake "$m4dir/Makefile") 2>/dev/null ||
+        please="$please
+Please run 'automake $m4dir/Makefile' to create $m4dir/Makefile.in
+"
+        ;;
+    esac
+  fi
 else
   please="$please
 Please add the files