diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/Automake/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/Automake/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/am/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/am/install.am | 9 | ||||
| -rw-r--r-- | m4/Makefile.in | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 2 |
12 files changed, 29 insertions, 15 deletions
@@ -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 b3d665579..58d84b70c 100644 --- 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: @@ -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 @@ -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 50a842543..ce40097f6 100644 --- 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 71dd62a8d..b14853179 100644 --- 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 e96495429..dd1352292 100644 --- 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 607675106..1ceec1c05 100644 --- 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 bef8b32d8..c446d39e8 100644 --- 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 ba32a7206..89ee94ed2 100644 --- 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 2ab09591a..be5065b6e 100644 --- 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 870d6f57b..8b099cf49 100644 --- 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: |