From de4e0888c19acbb32ac5bd2ca5ff8272121c4861 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 11 Dec 1998 00:32:34 +0000 Subject: [PATCH] Bug report from Paul D. Smith: * automake.in (handle_merge_targets): Set AM_INSTALL_PROGRAM_FLAGS, not INSTALL_PROGRAM. * header-vars.am (INSTALL_PROGRAM): Added AM_INSTALL_PROGRAM_FLAGS. --- ChangeLog | 8 ++++++++ automake.in | 6 +++--- header-vars.am | 5 ++++- lib/am/header-vars.am | 5 ++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef7e9b6..b4c0efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-12-11 Tom Tromey + + Bug report from Paul D. Smith: + * automake.in (handle_merge_targets): Set + AM_INSTALL_PROGRAM_FLAGS, not INSTALL_PROGRAM. + * header-vars.am (INSTALL_PROGRAM): Added + AM_INSTALL_PROGRAM_FLAGS. + 1998-12-03 Tom Tromey * automake.in (handle_dist): Print prettier banner when diff --git a/automake.in b/automake.in index 5567cae..4b21e19 100755 --- a/automake.in +++ b/automake.in @@ -3437,10 +3437,10 @@ sub handle_merge_targets &do_one_merge_target ('all', @all); - # Generate the new 'install-strip' target. Must set - # INSTALL_SCRIPT to avoid stripping scripts. + # Generate the new 'install-strip' target. We can't just set + # INSTALL_PROGRAM because that might be a relative path. $output_rules .= ("install-strip:\n\t" - . '$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=\'$(INSTALL_PROGRAM) -s\' INSTALL_SCRIPT=\'$(INSTALL_PROGRAM)\' install' + . '$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install' . "\n"); } diff --git a/header-vars.am b/header-vars.am index 3c0fd8e..1dd0813 100644 --- a/header-vars.am +++ b/header-vars.am @@ -52,7 +52,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +## We use AM_INSTALL_PROGRAM_FLAGS so that install-strip can pass -s +## easily. We can't just set INSTALL_PROGRAM because that might have +## a relative path. +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 3c0fd8e..1dd0813 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -52,7 +52,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +## We use AM_INSTALL_PROGRAM_FLAGS so that install-strip can pass -s +## easily. We can't just set INSTALL_PROGRAM because that might have +## a relative path. +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -- 2.7.4