]> sourceware.org Git - automake.git/commitdiff
* automake.in (&handle_merge_targets): Move `install-strip' from
authorAkim Demaille <akim@epita.fr>
Mon, 26 Feb 2001 09:23:41 +0000 (09:23 +0000)
committerAkim Demaille <akim@epita.fr>
Mon, 26 Feb 2001 09:23:41 +0000 (09:23 +0000)
here...
* install.am: to here.

ChangeLog
Makefile.in
automake.in
install.am
lib/am/install.am
m4/Makefile.in
tests/Makefile.in

index 7bb7198453cfff811cd422f31c7666fa1a07a9ac..4178947a42de3a9539345919a9d4efd5cf5598f9 100644 (file)
--- 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.
index 9122b3de86bda93e909d1b00bc5aa9bece5db4c8..f9c4853be44caa08d9043d0523526b202413521b 100644 (file)
@@ -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:
index 9973107fb0d35365852f0c6550132ddbee0b85ab..c5aa6013f7b640056a40c7325ae2d1bb3b2f136c 100755 (executable)
@@ -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');
 }
 
 
index 4de87436cd3bf84c3e91e52a4c471d147d8b33c2..e661f5015e41c3ea96e2afcd63a0e5d6027660ac 100644 (file)
 ?!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
index 4de87436cd3bf84c3e91e52a4c471d147d8b33c2..e661f5015e41c3ea96e2afcd63a0e5d6027660ac 100644 (file)
 ?!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
index e419c876d4ec7f3f23e2cb7b0b0d10f9d06dfd79..af62a5578f3f1da8126f95b8d9b128ed9d6f43b7 100644 (file)
@@ -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:
index 1e808b1868b360ea747f8124ef9a3c40b9eaaaf7..53c42084f7cb67624ed5f4506ec16c42141530c6 100644 (file)
@@ -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:
This page took 0.049432 seconds and 5 git commands to generate.