summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2016-03-09 14:29:30 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2016-03-09 14:29:30 (GMT)
commit5464c864e2561f64158289e122df869c7d55849b (patch)
tree8546af66fef7b1ddda87ebd540f66ea2f94eca0e
parent771d25e61ec3d4150fe3781e30c6c2a10cbdd8c1 (diff)
downloadtk-5464c864e2561f64158289e122df869c7d55849b.zip
tk-5464c864e2561f64158289e122df869c7d55849b.tar.gz
tk-5464c864e2561f64158289e122df869c7d55849b.tar.bz2
(cherry-pick) Explicit require Tcl 8.6.0, no matter if Tk is compiled against a later Tcl patchlevel.
-rw-r--r--win/makefile.vc2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index ae43eb6..6f61327 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -961,7 +961,7 @@ install-binaries:
!if !$(STATIC_BUILD)
@echo creating package index
@type << > $(OUT_DIR)\pkgIndex.tcl
-if {[catch {package present Tcl $(TCL_PATCH_LEVEL)}]} { return }
+if {[catch {package present Tcl 8.6.0}]} { return }
if {($$::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]
|| ([info exists ::argv] && ("-display" in $$::argv)))} {
package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin libtk$(TK_DOTVERSION).dll] Tk]