From 15a8e6313089c75a6669fcfccd1bc9755afe5893 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 10 Oct 2008 18:55:31 +0000 Subject: * 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]. --- ChangeLog | 4 ++++ unix/Makefile.in | 5 ++--- win/Makefile.in | 5 ++--- win/makefile.vc | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ad1e22..6829c9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,10 @@ * unix/configure: autoconf-2.59 * win/configure: + * 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]. + 2008-10-09 Don Porter * generic/tkListbox.c: Make literal return values consistent with diff --git a/unix/Makefile.in b/unix/Makefile.in index 96df504..ccb9def 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.143 2008/03/21 21:49:12 jenglish Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.143.2.1 2008/10/10 18:55:31 dgp Exp $ # Current Tk version; used in various names. @@ -704,8 +704,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ (\ - echo "if {[catch {package present Tcl\ - $(TCLVERSION)$(TCLPATCHL)}]} { return }";\ + echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ diff --git a/win/Makefile.in b/win/Makefile.in index 42c1312..0d5e572 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 2008/03/18 06:59:04 jenglish Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.78.2.1 2008/10/10 18:55:31 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -479,8 +479,7 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[catch {package present Tcl\ - $(TCLVERSION)$(TCLPATCHL)}]} { return }";\ + echo "if {[catch {package present Tcl 8.5.0-8.6}]} { 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 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)\" -- cgit v0.12