diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-06 09:52:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-06 09:52:03 (GMT) |
| commit | 097cd7b8533f7dbf0ab0369c01cf37f133816747 (patch) | |
| tree | ee3d5a191abfb3fede8384becd3e7750a92f6c34 | |
| parent | 5afcff86368c0cf33316c3dfad32f62dc9d93cb2 (diff) | |
| parent | 8a7a42b37c6d747b6d3cfc52d5a31331616b4bff (diff) | |
| download | tcl-097cd7b8533f7dbf0ab0369c01cf37f133816747.zip tcl-097cd7b8533f7dbf0ab0369c01cf37f133816747.tar.gz tcl-097cd7b8533f7dbf0ab0369c01cf37f133816747.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | unix/Makefile.in | 8 | ||||
| -rwxr-xr-x | unix/install-sh | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 45e9f9d..f21c4af 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -150,8 +150,8 @@ SHELL = @MAKEFILE_SHELL@ # around; better to use the install-sh script that comes with the # distribution, which is slower but guaranteed to work. -INSTALL_STRIP_PROGRAM = -s -INSTALL_STRIP_LIBRARY = -R -x +INSTALL_STRIP_PROGRAM = strip +INSTALL_STRIP_LIBRARY = strip -x INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c INSTALL_PROGRAM = ${INSTALL} @@ -997,8 +997,8 @@ install: $(INSTALL_TARGETS) install-strip: $(MAKE) $(INSTALL_TARGETS) \ - INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \ - INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}" + INSTALL_PROGRAM="STRIPPROG='${INSTALL_STRIP_PROGRAM}' $(INSTALL_PROGRAM) -s" \ + INSTALL_LIBRARY="STRIPPROG='${INSTALL_STRIP_LIBRARY}' $(INSTALL_LIBRARY) -s" install-binaries: binaries @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ diff --git a/unix/install-sh b/unix/install-sh index 093e5ea..ec298b5 100755 --- a/unix/install-sh +++ b/unix/install-sh @@ -110,7 +110,6 @@ Options: -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. -p pass -p to $cpprog. - -R OPTION $stripprog installed files using OPTION. -s $stripprog installed files. -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. @@ -155,9 +154,6 @@ while test $# -ne 0; do -p) cpprog="$cpprog -p";; - -R) stripcmd="$stripprog $2" - shift;; - -s) stripcmd=$stripprog;; -S) backupsuffix="$2" |