diff options
| author | dgp@users.sourceforge.net <dgp> | 2007-09-11 17:46:39 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2007-09-11 17:46:39 (GMT) |
| commit | 89022786e10d8bd3a7eb44f2053e1e31d6fcb0b0 (patch) | |
| tree | 75d59a4d6a8149488a33a415ec1c3b00bd2fe795 /unix | |
| parent | 3c8605b3c4287ee825258305a31350f58f0a02d4 (diff) | |
| download | tk-89022786e10d8bd3a7eb44f2053e1e31d6fcb0b0.zip tk-89022786e10d8bd3a7eb44f2053e1e31d6fcb0b0.tar.gz tk-89022786e10d8bd3a7eb44f2053e1e31d6fcb0b0.tar.bz2 | |
* generic/tkConsole.c: Revised calls to Tcl_InitStubs() and
* generic/tkMain.c: [package require Tcl] so that Tk Says What
* generic/tkWindow.c: It Means using the new facilties of [package]
* library/tk.tcl: in Tcl 8.5 about what version(s) of Tcl it
* unix/Makefile.in: is willing to work with. [Bug 1578344].
* win/Makefile.in:
* win/makefile.vc:
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 4e2e8fa..bc105f4 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.136 2007/09/06 19:34:02 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.137 2007/09/11 17:46:41 dgp Exp $ # Current Tk version; used in various names. @@ -706,11 +706,10 @@ 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 {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ + echo "if {[catch {package present Tcl\ + $(TCLVERSION)$(TCLPATCHL)}]} { return }";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(TCLPATCHL)\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > $(PKG_INDEX); \ fi |