diff options
| author | dgp@users.sourceforge.net <dgp> | 2008-10-10 18:55:31 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2008-10-10 18:55:31 (GMT) |
| commit | 7a3c8b3b14875a9792b6bf3083f2bf215086293c (patch) | |
| tree | edc5475958aaf5f6a153aece5c710b320ddd43a4 /win/makefile.vc | |
| parent | 8ec3faef6e2ee6d982dc789d363142d026df62a5 (diff) | |
| download | tk-7a3c8b3b14875a9792b6bf3083f2bf215086293c.zip tk-7a3c8b3b14875a9792b6bf3083f2bf215086293c.tar.gz tk-7a3c8b3b14875a9792b6bf3083f2bf215086293c.tar.bz2 | |
* unix/Makefile.in: Relax constraints in index script so that
* win/Makefile.in: each Tk 8.5.* release may be [package require]d
* win/makefile.vc: into any Tcl 8.5.* interp. [Bug 1890438].
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 9690013..8fad4b0 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.117 2008/03/18 06:59:04 jenglish Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.117.2.1 2008/10/10 18:55:31 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -897,7 +897,7 @@ install-binaries: !if !$(STATIC_BUILD) @echo creating package index @type << > $(OUT_DIR)\pkgIndex.tcl -if {[package vcompare [package provide Tcl] $(TCL_PATCH_LEVEL)] != 0} { return } +if {[catch {package present Tcl 8.5.0-8.6}]} { return } package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] << @$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\" |