From 2e1a86f8d7162040061501ce06da498c90f84358 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 21 Dec 1998 13:11:53 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ automake.in | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50b3eada..ad7989d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1998-12-21 Tom Tromey + + * 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 * tags.am (ID): Uniquify list of sources. Report from Jim diff --git a/automake.in b/automake.in index 4b21e199..095d0231 100755 --- 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; -- 2.43.5