diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-04 19:56:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-04 19:56:28 (GMT) |
| commit | 014a2170d9f130c22e78fd788df078627a280461 (patch) | |
| tree | 44dc7b1d7583103b103563ed32bea9c6257caf10 /win | |
| parent | 1a2230c81a0ddd977de08cc6c3a0e299ca36c184 (diff) | |
| parent | 552c527bbd8627990b37de00b416d8c9d60bc711 (diff) | |
| download | tcl-014a2170d9f130c22e78fd788df078627a280461.zip tcl-014a2170d9f130c22e78fd788df078627a280461.tar.gz tcl-014a2170d9f130c22e78fd788df078627a280461.tar.bz2 | |
Merge 8.6. TCL_PACKAGE_PATH is not used on Windows
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.in | 14 | ||||
| -rw-r--r-- | win/makefile.vc | 1 | ||||
| -rw-r--r-- | win/tclConfig.sh.in | 2 |
3 files changed, 1 insertions, 16 deletions
diff --git a/win/configure.in b/win/configure.in index 02cc79b..80c1f15 100644 --- a/win/configure.in +++ b/win/configure.in @@ -364,19 +364,6 @@ else fi 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 @@ -464,7 +451,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 ef67c66..e94e3db 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -717,7 +717,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 aba0532..d69a9da 100644 --- a/win/tclConfig.sh.in +++ b/win/tclConfig.sh.in @@ -148,7 +148,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 |