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.

diff --git a/ChangeLog b/ChangeLog
index ef7e9b604a48f010b21251a9316cd19da5994b44..b4c0efd11072394cbc820ffeb005e595b26d474c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-11  Tom Tromey  <tromey@cygnus.com>
+
+       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  <tromey@cygnus.com>
 
        * automake.in (handle_dist): Print prettier banner when

diff --git a/automake.in b/automake.in
index 5567cae0f657f45dbbfe6b7d4cc507f711f5956b..4b21e19948c2f6af94854652d72754db10df5402 100755 (executable)
--- 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 3c0fd8e32830c6fd10038c99e09844d3016ad94f..1dd0813bbd214fb7ce33ce964a720c1b75031f6d 100644 (file)
--- 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 3c0fd8e32830c6fd10038c99e09844d3016ad94f..1dd0813bbd214fb7ce33ce964a720c1b75031f6d 100644 (file)
--- 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@