+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
# 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');
&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;