diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-07 09:39:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-07 09:39:07 (GMT) |
| commit | 93587bb96268d35646bc2bc628a054e3461fa374 (patch) | |
| tree | 336a152c40ece2cf14cf71dbcab73dd8b6ee5280 | |
| parent | 0c7f4a72734820ca0637aa250f39804103ef1c63 (diff) | |
| download | tk-93587bb96268d35646bc2bc628a054e3461fa374.zip tk-93587bb96268d35646bc2bc628a054e3461fa374.tar.gz tk-93587bb96268d35646bc2bc628a054e3461fa374.tar.bz2 | |
Fix [https://core.tcl-lang.org/tcl/info/d3465c9188|d3465c9188]: Update install-sh to version "2020-11-14.01; # UTC", without tweak
| -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 3c96171..0567e41 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -219,8 +219,8 @@ TKTEST_EXE = tktest${EXE_SUFFIX} # "install" 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} @@ -712,8 +712,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: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} @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" |