diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-11 18:32:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-11 18:32:34 (GMT) |
| commit | 4462f84415743f96fc1a0744d4ec040297685999 (patch) | |
| tree | 11eb6860299f23712297ab8755a89a6491711007 /win/Makefile.in | |
| parent | cb6b3761663fe1c05c044d2aa758fd75bb9c28ec (diff) | |
| download | tk-4462f84415743f96fc1a0744d4ec040297685999.zip tk-4462f84415743f96fc1a0744d4ec040297685999.tar.gz tk-4462f84415743f96fc1a0744d4ec040297685999.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 9acbbba..d2c0da2 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,11 +4,12 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.73 2007/05/14 20:58:28 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.73.2.1 2007/09/11 18:32:36 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ VERSION = @TK_VERSION@ +PATCH_LEVEL = @TK_PATCH_LEVEL@ #---------------------------------------------------------------- # Things you can change to personalize the Makefile for your own @@ -479,10 +480,9 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)$(TCLPATCHL)\ + echo "if {[catch {package present Tcl\ + $(TCLVERSION)$(TCLPATCHL)]} { return }";\ + echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ |