install-strip fix

diff --git a/ChangeLog b/ChangeLog
index 0b1a26a664899a1346c39558ee3daf560a925ce1..48b5d5db2ca0a0bdb0f6f030c3753b96abb9c04f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 15 12:05:20 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_merge_targets): Set INSTALL_SCRIPT in
+       install-strip target.
+
 Tue May 13 08:20:02 1997  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_dependencies): Don't generate dependencies

diff --git a/automake.in b/automake.in
index 471fd5886e1bb9f72ec503afd4f42dfb1f685d3c..aa8af5bf86c52304ad1af0acaa9a12cb64ad6a21 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3451,9 +3451,10 @@ sub handle_merge_targets
                      . "\n\n");
     push (@phony, 'all');
 
-    # Generate the new 'install-strip' target.
+    # Generate the new 'install-strip' target.  Must set
+    # INSTALL_SCRIPT to avoid stripping scripts.
     $output_rules .= ("install-strip:\n\t"
-                     . '$(MAKE) INSTALL_PROGRAM=\'$(INSTALL_PROGRAM) -s\' install'
+                     . '$(MAKE) INSTALL_PROGRAM=\'$(INSTALL_PROGRAM) -s\' INSTALL_SCRIPT=\'$(INSTALL_PROGRAM)\' install'
                      . "\n");
 }