From 098f773fbd1373c185c423150f84e481f0a7d847 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 26 Feb 2001 09:23:41 +0000
Subject: [PATCH] * automake.in (&handle_merge_targets): Move `install-strip'
 from here... * install.am: to here.

---
 ChangeLog         |  6 ++++++
 Makefile.in       |  7 ++++---
 automake.in       | 15 ---------------
 install.am        | 10 ++++++++++
 lib/am/install.am | 10 ++++++++++
 m4/Makefile.in    |  7 ++++---
 tests/Makefile.in |  5 +++--
 7 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7bb71984..4178947a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&handle_merge_targets): Move `install-strip' from
+	here...
+	* install.am: to here.
+
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (@installdirs): Remove.
diff --git a/Makefile.in b/Makefile.in
index 9122b3de..f9c4853b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -509,14 +509,15 @@ install-am: all-am
 install: install-recursive
 uninstall: uninstall-recursive
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir)
 
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
+
 mostlyclean-generic:
 
 clean-generic:
diff --git a/automake.in b/automake.in
index 9973107f..c5aa6013 100755
--- a/automake.in
+++ b/automake.in
@@ -3667,21 +3667,6 @@ sub handle_merge_targets
     &do_one_merge_target ('uninstall');
 
     &do_one_merge_target ('all', @all);
-
-    # Generate the new 'install-strip' target.  (If you ever modify
-    # this, keep in mind that INSTALL_PROGRAM is used in
-    # subdirectories, so never set it to a value relative to
-    # the top directory.)
-    $output_rules .= ("install-strip:\n\t"
-		      . '$(MAKE) $(AM_MAKEFLAGS) '
-		      # Use double quotes here because we might need
-		      # to interpolate some backquotes at runtime.
-		      . "INSTALL_PROGRAM=\"\$(INSTALL_STRIP_PROGRAM)\" "
-		      . "\\\n\t  "
-		      . "INSTALL_PROGRAM_ENV='\$(INSTALL_STRIP_PROGRAM_ENV)' "
-		      . 'install'
-		      . "\n");
-    &depend ('.PHONY', 'install-strip');
 }
 
 
diff --git a/install.am b/install.am
index 4de87436..e661f501 100644
--- a/install.am
+++ b/install.am
@@ -24,3 +24,13 @@
 ?!SUBDIRS?.PHONY: installdirs
 ?!SUBDIRS?installdirs:
 ?!SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
+
+## If you ever modify this, keep in mind that INSTALL_PROGRAM is used
+## in subdirectories, so never set it to a value relative to the top
+## directory.
+.PHONY: install-strip
+install-strip:
+## Use double quotes here because we might need to interpolate some
+## backquotes at runtime.
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
diff --git a/lib/am/install.am b/lib/am/install.am
index 4de87436..e661f501 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -24,3 +24,13 @@
 ?!SUBDIRS?.PHONY: installdirs
 ?!SUBDIRS?installdirs:
 ?!SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
+
+## If you ever modify this, keep in mind that INSTALL_PROGRAM is used
+## in subdirectories, so never set it to a value relative to the top
+## directory.
+.PHONY: install-strip
+install-strip:
+## Use double quotes here because we might need to interpolate some
+## backquotes at runtime.
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e419c876..af62a557 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -158,13 +158,14 @@ install-am: all-am
 install: install-am
 uninstall: uninstall-am
 all-am: Makefile $(DATA)
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
 
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
+
 mostlyclean-generic:
 
 clean-generic:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1e808b18..53c42084 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -463,12 +463,13 @@ install-am: all-am
 install: install-am
 uninstall: uninstall-am
 all-am: Makefile
+
+installdirs:
+
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
 
-installdirs:
-
 mostlyclean-generic:
 
 clean-generic:
-- 
2.43.5