diff options
| author | andreas_kupries <akupries@shaw.ca> | 2006-09-27 18:43:35 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2006-09-27 18:43:35 (GMT) |
| commit | 79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd (patch) | |
| tree | 97d84f96b7f3dff90ccda6a66f747ac34977593f /win/makefile.vc | |
| parent | 0cbae2255aa4378510703eb4e1b6fe4aedb2e4d9 (diff) | |
| download | tk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.zip tk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.tar.gz tk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.tar.bz2 | |
* unix/Makefile.in (install-binaries): Added a second guard to the
* win/Makefile.in: package index file to prevent older versions of
* win/makefile.vc: Tcl from seeing version numbers which may
contain a/b information, and then balking on them. This could
otherwise happen when Tcl/Tk 8.4 and 8.5 are installed in the
same directory, seeing each other. [SF Tk Bug 1566418].
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 59ca458..c9e622f 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.93 2006/09/22 19:02:08 andreas_kupries Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.94 2006/09/27 18:43:35 andreas_kupries Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -842,7 +842,8 @@ install-binaries: !if !$(STATIC_BUILD) @echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" -del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" - echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" + echo if {![package vsatisfies [package provide Tcl] $(TCL_DOTVERSION)]} { return } > "$(OUT_DIR)\pkgIndex.tcl" + echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } >>"$(OUT_DIR)\pkgIndex.tcl" echo package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" $(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\" !endif |