* automake.in (&handle_merge_targets): Move `install-strip' from

here...
* install.am: to here.

diff --git a/ChangeLog b/ChangeLog
index 7bb7198..4178947 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
        (&file_contents): Be able to grow Automake macros with `+='.
        (&handle_texinfo, &handle_man_pages, &am_install_var): Let your

diff --git a/Makefile.in b/Makefile.in
index 9122b3d..f9c4853 100644 (file)
--- 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 9973107..c5aa601 100755 (executable)
--- 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 4de8743..e661f50 100644 (file)
--- 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 4de8743..e661f50 100644 (file)
--- 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 e419c87..af62a55 100644 (file)
--- 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 1e808b1..53c4208 100644 (file)
--- 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: