Fixed noinst.test again:

	* automake.in (do_one_merge_target): Special-case `install-am'.
	(handle_merge_targets): Don't compute @install variable.

diff --git a/ChangeLog b/ChangeLog
index 7b21185550d4bf130cece8984ce0308bd3551c77..8b3d120f48cba54cbc60a266a184a678245f01d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Tue Sep 29 00:10:22 1998  Tom Tromey  <tromey@cygnus.com>
 
+       Fixed noinst.test again:
+       * automake.in (do_one_merge_target): Special-case `install-am'.
+       (handle_merge_targets): Don't compute @install variable.
+
        Fixes for recurs2.test.  Report from Jim Meyering.
        * automake.in (vars_scanned): Define globally.
        (variable_value_as_list_worker): Delete $var entry in

diff --git a/automake.in b/automake.in
index b0ee807860c803e536ac8af25d1d3ad92fae3196..bf726f713908eb0d32f7c62c7422318c8c4cfd42 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3540,7 +3540,6 @@ sub handle_merge_targets
                          . "\n");
     }
     $output_rules .= "\n";
-    push (@install, 'install-exec-am');
 
     &do_one_merge_target ('install-data', @install_data);
     if (defined $contents{'install-data-hook'})
@@ -3550,9 +3549,8 @@ sub handle_merge_targets
                          . "\n");
     }
     $output_rules .= "\n";
-    push (@install, 'install-data-am');
 
-    &do_one_merge_target ('install', @install);
+    &do_one_merge_target ('install', 'all-am');
     &do_one_merge_target ('uninstall', @uninstall);
 
     &do_one_merge_target ('all', @all);
@@ -3578,6 +3576,14 @@ sub do_one_merge_target
     }
 
     &pretty_print_rule ($name . "-am:", "\t\t", @values);
+    if ($name eq 'install')
+    {
+       # Special-case `install-am' to run install-exec-am and
+       # install-data-am after all-am is built.
+       &pretty_print_rule ("\t\$(MAKE) \$(AM_MAKEFLAGS)", "\t  ",
+                           'install-exec-am', 'install-data-am');
+    }
+
     local ($lname) = $name . ($recursive_install ? '-recursive' : '-am');
     local ($tname) = $name;
     # To understand this special case, see handle_merge_targets.