diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-04 20:30:24 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-04 20:30:24 (GMT) |
commit | 1ff4f587bb8b435c1bedfd9cfdee71f127d78455 (patch) | |
tree | 0d0feef7fa6515722bb04530c6ba7b7d72f2ba72 /win | |
parent | aa99b9e9a87d30bc77d16d14ae9f62bb1fab5562 (diff) | |
parent | 5c571a22157bec82477fbcf85c94ab7ea8823b13 (diff) | |
download | tcl-1ff4f587bb8b435c1bedfd9cfdee71f127d78455.zip tcl-1ff4f587bb8b435c1bedfd9cfdee71f127d78455.tar.gz tcl-1ff4f587bb8b435c1bedfd9cfdee71f127d78455.tar.bz2 |
Merge 8.6
Diffstat (limited to 'win')
-rwxr-xr-x | win/configure | 15 | ||||
-rw-r--r-- | win/configure.ac | 14 | ||||
-rw-r--r-- | win/makefile.vc | 1 | ||||
-rw-r--r-- | win/tclConfig.sh.in | 2 |
4 files changed, 1 insertions, 31 deletions
diff --git a/win/configure b/win/configure index 75a3c38..178d6ff 100755 --- a/win/configure +++ b/win/configure @@ -653,7 +653,6 @@ TCL_REG_VERSION TCL_DDE_MINOR_VERSION TCL_DDE_MAJOR_VERSION TCL_DDE_VERSION -TCL_PACKAGE_PATH TCL_EXP_FILE TCL_BUILD_EXP_FILE TCL_LD_SEARCH_FLAGS @@ -5922,19 +5921,6 @@ else RC_DEFINES="" fi -#-------------------------------------------------------------------- -# The statements below define the symbol TCL_PACKAGE_PATH, which -# gives a list of directories that may contain packages. The list -# consists of one directory for machine-dependent binaries and -# another for platform-independent scripts. -#-------------------------------------------------------------------- - -if test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}" -else - TCL_PACKAGE_PATH="{${prefix}/lib}" -fi - # The tclsh.exe.manifest requires these # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs # the release level, and must account for interim release versioning @@ -6022,7 +6008,6 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d - # win only diff --git a/win/configure.ac b/win/configure.ac index 8391161..173efbf 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -371,19 +371,6 @@ else RC_DEFINES="" fi -#-------------------------------------------------------------------- -# The statements below define the symbol TCL_PACKAGE_PATH, which -# gives a list of directories that may contain packages. The list -# consists of one directory for machine-dependent binaries and -# another for platform-independent scripts. -#-------------------------------------------------------------------- - -if test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}" -else - TCL_PACKAGE_PATH="{${prefix}/lib}" -fi - # The tclsh.exe.manifest requires these # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs # the release level, and must account for interim release versioning @@ -470,7 +457,6 @@ AC_SUBST(TCL_LD_SEARCH_FLAGS) AC_SUBST(TCL_BUILD_EXP_FILE) AC_SUBST(TCL_EXP_FILE) AC_SUBST(DL_LIBS) -AC_SUBST(TCL_PACKAGE_PATH) # win only AC_SUBST(TCL_DDE_VERSION) diff --git a/win/makefile.vc b/win/makefile.vc index 3f6a7e5..9c5882e 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -821,7 +821,6 @@ $(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in @TCL_LIB_SPEC@ $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
@TCL_INCLUDE_SPEC@ -I$(INCLUDE_INSTALL_DIR)
@TCL_SRC_DIR@ $(ROOT)
-@TCL_PACKAGE_PATH@
@TCL_STUB_LIB_FILE@ $(TCLSTUBLIBNAME)
@TCL_STUB_LIB_FLAG@ $(TCLSTUBLIBNAME)
@TCL_STUB_LIB_SPEC@ -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in index 1c33246..7228af6 100644 --- a/win/tclConfig.sh.in +++ b/win/tclConfig.sh.in @@ -152,7 +152,7 @@ TCL_SRC_DIR='@TCL_SRC_DIR@' # List of standard directories in which to look for packages during # "package require" commands. Contains the "prefix" directory plus also # the "exec_prefix" directory, if it is different. -TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@' +TCL_PACKAGE_PATH='' # Tcl supports stub. TCL_SUPPORTS_STUBS=1 |