summaryrefslogtreecommitdiffstats
path: root/win/configure
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2020-07-07 15:32:20 (GMT)
committerdgp <dgp@users.sourceforge.net>2020-07-07 15:32:20 (GMT)
commitf289a9d57ec45ca466cae2d5747c0f2d2df4fc48 (patch)
treefbd85eea1e8c2ce3c0d772d8ace22b3ba050c058 /win/configure
parentc56d964dcb20fe65c38e65b7274c45351b7e6e44 (diff)
parent131eb6c30bec526285cbc4dc33869718c17de7f4 (diff)
downloadtcl-f289a9d57ec45ca466cae2d5747c0f2d2df4fc48.zip
tcl-f289a9d57ec45ca466cae2d5747c0f2d2df4fc48.tar.gz
tcl-f289a9d57ec45ca466cae2d5747c0f2d2df4fc48.tar.bz2
merge 8.6
Diffstat (limited to 'win/configure')
-rwxr-xr-xwin/configure9
1 files changed, 4 insertions, 5 deletions
diff --git a/win/configure b/win/configure
index 1f91cf0..3f09a30 100755
--- a/win/configure
+++ b/win/configure
@@ -5064,10 +5064,6 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
# Perform final evaluations of variables with possible substitutions.
#--------------------------------------------------------------------
-TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
-TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
-TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
-
eval "TCL_SRC_DIR=\"`cd $srcdir/..; $CYGPATH $(pwd)`\""
eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
@@ -5086,12 +5082,15 @@ eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\""
# Install time header dir can be set via --includedir
eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
-
eval "DLLSUFFIX=${DLLSUFFIX}"
eval "LIBPREFIX=${LIBPREFIX}"
eval "LIBSUFFIX=${LIBSUFFIX}"
eval "EXESUFFIX=${EXESUFFIX}"
+TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
+TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+
CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}
CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}
CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}