diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-10-15 17:48:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-10-15 17:48:50 (GMT) |
| commit | 8f5b9b9a67aa916120e024a34bfe85e84b7c7444 (patch) | |
| tree | 6f8976b95c527baa9bc49f6b6c721f3c4f8e506e /win | |
| parent | dae8e3e1481db52a1f19e7a2b8f2dc2d13c1f8ac (diff) | |
| download | tk-8f5b9b9a67aa916120e024a34bfe85e84b7c7444.zip tk-8f5b9b9a67aa916120e024a34bfe85e84b7c7444.tar.gz tk-8f5b9b9a67aa916120e024a34bfe85e84b7c7444.tar.bz2 | |
* generic/tkConsole.c: Relax the runtime version requirements on Tcl
* generic/tkMain.c: so that Tk 8.5.8 can [load] into Tcl 8.6 (and
* generic/tkWindow.c: later 8.*) interps.
* library/tk.tcl
* unix/Makefile.in:
* win/Makefile.in:
* win/makefile.vc:
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 3b91efe..26783a8 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.78.2.2 2009/04/10 11:07:32 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.78.2.3 2009/10/15 17:48:50 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -479,7 +479,7 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\ + echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ ) > $(PKG_INDEX); diff --git a/win/makefile.vc b/win/makefile.vc index 8fad4b0..fdc534d 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.2.1 2008/10/10 18:55:31 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.117.2.2 2009/10/15 17:48:50 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 {[catch {package present Tcl 8.5.0-8.6}]} { return } +if {[catch {package present Tcl 8.5.0}]} { return } package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] << @$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\" |