diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-09 15:48:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-09 15:48:27 (GMT) |
| commit | 215218551eaaa3ccb84b7480e02a125ba85e0a68 (patch) | |
| tree | 3f6c8b9296b9dae25309d41b6097533d7a690d0e /win/Makefile.in | |
| parent | 190cf724dacb1246204691ea0dcfcc3d3bb406d7 (diff) | |
| parent | b0592caab7bcad30d7dd0617023fd14f8b45978a (diff) | |
| download | tk-215218551eaaa3ccb84b7480e02a125ba85e0a68.zip tk-215218551eaaa3ccb84b7480e02a125ba85e0a68.tar.gz tk-215218551eaaa3ccb84b7480e02a125ba85e0a68.tar.bz2 | |
Merge "enhanced-index" branch
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 9d16cdb..1211a9c 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -136,6 +136,8 @@ TK_VFS_ROOT = libtk.vfs TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@ TK_LIB_FILE = @TK_LIB_FILE@ TK_DLL_FILE = @TK_DLL_FILE@ +TK_DLL_FILE_TCL8 = @TK_DLL_FILE_TCL8@ +TK_DLL_FILE_TCL9 = @TK_DLL_FILE_TCL9@ TEST_DLL_FILE = tktest$(VER)${DLLSUFFIX} TEST_LIB_FILE = @LIBPREFIX@tktest$(VER)${DLLSUFFIX}${LIBSUFFIX} @@ -535,9 +537,17 @@ install-binaries: binaries echo "if {![package vsatisfies [package provide Tcl] 8.6-]} return";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\ + echo " if {[package vsatisfies [package provide Tcl] 9.0]} {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtcl9tk$(VERSION).dll]]]";\ + echo " } else {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\ + echo " }";\ echo "} else {";\ - echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]]]";\ + echo " if {[package vsatisfies [package provide Tcl] 9.0]} {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE_TCL9)]]]";\ + echo " } else {";\ + echo " package ifneeded tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE_TCL8)]]]";\ + echo " }";\ echo "}";\ echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list package require -exact tk $(VERSION)$(PATCH_LEVEL)]";\ ) > $(PKG_INDEX); |