]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
projects / thirdparty / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8afb58e)
* lib/am/install.am (install-strip): Override install_sh_PROGRAM
authorAlexandre Duret-Lutz <adl@gnu.org>
Tue, 21 Oct 2003 13:05:55 +0000 (13:05 +0000)
committerAlexandre Duret-Lutz <adl@gnu.org>
Tue, 21 Oct 2003 13:05:55 +0000 (13:05 +0000)
too.
Report from Elmar Hoffmann.

12 files changed:
ChangeLog patch | blob | blame | history
Makefile.in patch | blob | blame | history
THANKS patch | blob | blame | history
configure patch | blob | blame | history
doc/Makefile.in patch | blob | blame | history
lib/Automake/Makefile.in patch | blob | blame | history
lib/Automake/tests/Makefile.in patch | blob | blame | history
lib/Makefile.in patch | blob | blame | history
lib/am/Makefile.in patch | blob | blame | history
lib/am/install.am patch | blob | blame | history
m4/Makefile.in patch | blob | blame | history
tests/Makefile.in patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 40b814f0394e177a2d17e2eac35222d948189a91..22ec1ade737efca193ac0b16a922c310cb1cff24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-21  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/install.am (install-strip): Override install_sh_PROGRAM
+       too.
+       Report from Elmar Hoffmann.
+
 2003-10-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * aclocal.in ("MAIN", usage, parse_arguments): Move near
diff --git a/Makefile.in b/Makefile.in
index b3d665579d7b33b71f6457190a17e355fba700d4..58d84b70c9b0401f0d4986f42d53100a57220ab6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -494,7 +494,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/THANKS b/THANKS
index 5a4d6ce4a82598b101a28c2f9362031be6d894aa..9d31ba1ac3168f59f5663ef5d361458ca22d3a31 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -51,6 +51,7 @@ Dmitry Mikhin         dmitrym@acres.com.au
 Doug Evans             devans@cygnus.com
 Duncan Gibson          duncan@thermal.esa.int
 Eleftherios Gkioulekas lf@amath.washington.edu
+Elmar Hoffmann         elho@elho.net
 Elrond                 Elrond@Wunder-Nett.org
 Enrico Scholz          enrico.scholz@informatik.tu-chemnitz.de
 Erez Zadok             ezk@cs.columbia.edu
diff --git a/configure b/configure
index 5293c3ec860e8c19afd05260f61e739ec76e5672..9390846a0b9ecac7ced32677e4c8750949f2b760 100755 (executable)
--- a/configure
+++ b/configure
@@ -24,7 +24,7 @@ fi
 DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -227,10 +227,10 @@ fi
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -2006,7 +2006,7 @@ fi
 DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -2211,10 +2211,10 @@ fi
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 50a84254360d733864096b2eccf5b5624617041b..ce40097f64fc19ed1248d0ac3f3805e1702fe0eb 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -368,7 +368,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 71dd62a8d67c1efc21318d0f999aedd1961c3b22..b14853179a7ea0656153090c68bd0fb174265efc 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -403,7 +403,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index e96495429203a3fd41ce2eed595fae64c67648f4..dd13522926e63f4a4f9f78945a10111196c9e39e 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -273,7 +273,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 607675106905d560f7e2da4acd9d44be4132de0a..1ceec1c05211a4f3370927bb66d2fe1fb0a8a897 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -379,7 +379,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index bef8b32d881e61c30267b35eb32dc10e54262f6b..c446d39e88ab4c1e8f9a9b64a89d8428eb814994 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -222,7 +222,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/lib/am/install.am b/lib/am/install.am
index ba32a7206b60169fa34be505e9234e1936860572..89ee94ed23c4450071ac68208056424a1036a2e9 100644 (file)
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -71,9 +71,16 @@ install-am: all-am
 ## directory.
 .PHONY: install-strip
 install-strip:
+## Beware that they are two variables used to install programs:
+##   INSTALL_PROGRAM is used for ordinary *_PROGRAMS
+##   install_sh_PROGRAM us used for nobase_*_PROGRAMS (because install-sh
+##                                                     creates directories)
+## It's OK to override both with INSTALL_STRIP_PROGRAM, because
+## INSTALL_STRIP_PROGRAM uses install-sh (see m4/strip.m4 for a rational).
+##
 ## Use double quotes here because we might need to interpolate some
 ## backquotes at runtime.
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 2ab09591a18c0d6f225c950f024c73d6f08f8475..be5065b6e2c81964ae726e806904a3b8e089736e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -248,7 +248,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 870d6f57be39b8c46fada23d1e08d00d3e5d449c..8b099cf4942f02c761059c9555808083ce216b5e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -779,7 +779,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
Mirror of https://github.com/autotools-mirror/automake.git