From: Tom Tromey <tromey@redhat.com>
Date: Thu, 28 Jun 2001 15:06:50 +0000 (+0000)
Subject: 2001-06-28  Tom Tromey  <tromey@redhat.com>
X-Git-Tag: Release-1-4h~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cb2da8e18ee254fcdd70f4b38232e9f2a78dc28;p=thirdparty%2Fautomake.git

2001-06-28  Tom Tromey  <tromey@redhat.com>

	* lib/am/libs.am (RANLIB): Don't define.

2001-06-28  Alexandre Duret-Lutz  <duret_g@epita.fr>

	* automake.in (am_install_var): Assign 1 to $first on
	first interation.
---

diff --git a/ChangeLog b/ChangeLog
index cf1529fef..8ba356285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-28  Tom Tromey  <tromey@redhat.com>
+
+	* lib/am/libs.am (RANLIB): Don't define.
+
+2001-06-28  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* automake.in (am_install_var): Assign 1 to $first on
+	first interation.
+
 2001-06-23  Tom Tromey  <tromey@redhat.com>
 
 	Fix for yacc5.test:
diff --git a/automake.in b/automake.in
index eb51544da..a1e1979b3 100755
--- a/automake.in
+++ b/automake.in
@@ -7170,7 +7170,7 @@ sub am_install_var
 
     # True if the iteration is the first one.  Used for instance to
     # output parts of the associated file only once.
-    my $first = 0;
+    my $first = 1;
     foreach my $X (sort keys %valid)
     {
 	my $one_name = $X . '_' . $primary;
@@ -7304,7 +7304,7 @@ sub am_install_var
 					  'INSTALL' => $install_p,
 					  'DIST'    => $dist_p));
 
-	$first = '';
+	$first = 0;
     }
 
     # The JAVA variable is used as the name of the Java interpreter.
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 100b8dd7e..b7e9db8bc 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -23,7 +23,8 @@
 
 if %?FIRST%
 AR = ar
-RANLIB = @RANLIB@
+## For now this is detected when we see AC_PROG_RANLIB
+## RANLIB = @RANLIB@
 endif %?FIRST%
 
 ## ------------ ##