diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-02 19:34:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-02 19:34:00 (GMT) |
| commit | 0472854629fd686353d1250c700382fb829ea2ef (patch) | |
| tree | 496f7c6f4df3077705bce3084b3e19a5ae7198d7 /unix | |
| parent | 47f462c33cd417a6f36038282806c5ce0757ba5e (diff) | |
| parent | cca28f5ef38fe8c9c7778d0cb036b5d421d70c75 (diff) | |
| download | tcl-0472854629fd686353d1250c700382fb829ea2ef.zip tcl-0472854629fd686353d1250c700382fb829ea2ef.tar.gz tcl-0472854629fd686353d1250c700382fb829ea2ef.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rwxr-xr-x | unix/installManPage | 9 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure index 426954a..ebc2e50 100755 --- a/unix/configure +++ b/unix/configure @@ -5774,7 +5774,6 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a' SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5 printf %s "checking for Cygwin version of gcc... " >&6; } @@ -7161,7 +7160,7 @@ then : if test "${SHLIB_SUFFIX}" = ".dll" then : - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" else $as_nop diff --git a/unix/installManPage b/unix/installManPage index 86f9860..3d5fa7b 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -5,13 +5,14 @@ ### Gzip=: -SymOrLoc="" +Sym="" +Loc="" Gz="" Suffix="" while true; do case $1 in - -s | --symlinks ) SymOrLoc="-s " ;; + -s | --symlinks ) Sym="-s " ;; -z | --compress ) Gzip=$2; shift ;; -e | --extension ) Gz=$2; shift ;; -x | --suffix ) Suffix=$2; shift ;; @@ -47,7 +48,7 @@ if test -d "$Dir" ; then : ; else echo "target directory must exist" exit 1 fi -test -z "$SymOrLoc" && SymOrLoc="$Dir/" +test -z "$Sym" && Loc="$Dir/" ######################################################################## ### Extract Target Names from Manual Page @@ -132,7 +133,7 @@ for Target in $Names; do chmod 644 "$Dir/$First" $Gzip "$Dir/$First" else - ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz" + ln $Sym"$Loc$First$Gz" "$Dir/$Target$Gz" fi done diff --git a/unix/tcl.m4 b/unix/tcl.m4 index ecfec69..0aef9cf 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1088,7 +1088,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a' SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a" AC_CACHE_CHECK(for Cygwin version of gcc, ac_cv_cygwin, @@ -1805,7 +1804,7 @@ dnl # preprocessing tests use only CPPFLAGS. LIB_SUFFIX=${SHARED_LIB_SUFFIX} MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" ], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' |