* automake.in (do_one_merge_target): Special case

	install-data-hook and install-exec-hook.
	(handle_merge_targets): Removed install-data-hook and
	install-exec-hook code.  Test insthook.test.

diff --git a/ChangeLog b/ChangeLog
index 50b3eadabcf44d9d82954368d7a9f7dabecbf7d9..ad7989d21eaec5117b2ebf9774f7ccca7ba57042 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-21  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (do_one_merge_target): Special case
+       install-data-hook and install-exec-hook.
+       (handle_merge_targets): Removed install-data-hook and
+       install-exec-hook code.  Test insthook.test.
+
 1998-12-16  Tom Tromey  <tromey@cygnus.com>
 
        * tags.am (ID): Uniquify list of sources.  Report from Jim

diff --git a/automake.in b/automake.in
index 4b21e19948c2f6af94854652d72754db10df5402..095d023167cc7e225f403da1454c63ce14520d55 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3415,21 +3415,9 @@ sub handle_merge_targets
 
     # Print definitions users can use.
     &do_one_merge_target ('install-exec', @install_exec);
-    if (&target_defined ('install-exec-hook'))
-    {
-       $output_rules .= ("\t\@\$(NORMAL_INSTALL)\n"
-                         . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook'
-                         . "\n");
-    }
     $output_rules .= "\n";
 
     &do_one_merge_target ('install-data', @install_data);
-    if (defined $contents{'install-data-hook'})
-    {
-       $output_rules .= ("\t\@\$(NORMAL_INSTALL)\n"
-                         . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-data-hook'
-                         . "\n");
-    }
     $output_rules .= "\n";
 
     &do_one_merge_target ('install', 'all-am');
@@ -3465,6 +3453,18 @@ sub do_one_merge_target
        &pretty_print_rule ("\t\@\$(MAKE) \$(AM_MAKEFLAGS)", "\t  ",
                            'install-exec-am', 'install-data-am');
     }
+    elsif ($name eq 'install-exec' && &target_defined ('install-exec-hook'))
+    {
+       $output_rules .= ("\t\@\$(NORMAL_INSTALL)\n"
+                         . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook'
+                         . "\n");
+    }
+    elsif ($name eq 'install-data' && &target_defined ('install-data-hook'))
+    {
+       $output_rules .= ("\t\@\$(NORMAL_INSTALL)\n"
+                         . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-data-hook'
+                         . "\n");
+    }
 
     local ($lname) = $name . ($recursive_install ? '-recursive' : '-am');
     local ($tname) = $name;