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 cf1529fef3f071b7c1b2eaeee9b4631247ee72b6..8ba356285200e37c9bf7e021eae77f78e9cd98b2 100644 (file)
--- 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 eb51544da95b2ad339062281b9b670113d261744..a1e1979b3d69bf02c51512bbd0be3a9aee3738d3 100755 (executable)
--- 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 100b8dd7e3cca0fc42ba7f4c2916988a202e94e6..b7e9db8bcf12c071a3bc1656acf579168b457660 100644 (file)
--- 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%
 
 ## ------------ ##