diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-15 05:43:29 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-15 05:43:29 (GMT) |
| commit | 66315906a3e35c5937a964312cde8419c386314b (patch) | |
| tree | c05be6a98b067fa3c2fe9faea0edf4b538e92e52 | |
| parent | e35b17d7fcc763b19e43339ca575f9336d4d6eca (diff) | |
| download | tk-66315906a3e35c5937a964312cde8419c386314b.zip tk-66315906a3e35c5937a964312cde8419c386314b.tar.gz tk-66315906a3e35c5937a964312cde8419c386314b.tar.bz2 | |
Backport of [Bug 3532186] fix
| -rw-r--r-- | unix/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 8d4a77f..eb30d25 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -720,13 +720,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ else \ echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ echo "} else {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ |