diff options
| author | andreas_kupries <akupries@shaw.ca> | 2006-09-25 17:28:20 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2006-09-25 17:28:20 (GMT) |
| commit | 9dfdfe057b35a6a13b2da62fb23c03bd87ab030f (patch) | |
| tree | 9559a7b3b52052bd43516eb4b4585cc0640d6675 /unix | |
| parent | 8a50ab5e2c3c18775c254efd2651bd27320b3dab (diff) | |
| download | tk-9dfdfe057b35a6a13b2da62fb23c03bd87ab030f.zip tk-9dfdfe057b35a6a13b2da62fb23c03bd87ab030f.tar.gz tk-9dfdfe057b35a6a13b2da62fb23c03bd87ab030f.tar.bz2 | |
* generic/tkConsole.c: Complete reversal of the changes of Sep 22.
* generic/tkMain.c: For compat reason the Tcl core will not change
* generic/tkWindow.c: the registered version to include the patchlevel,
* library/tk.tcl: making the changes to Tk unnecessary.
* unix/configure:
* unix/Makefile.in:
* unix/tcl.m4:
* win/configure:
* win/Makefile.in:
* win/makefile.vc:
* win/rules.vc:
* win/tcl.m4:
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 7601716..44c4695 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.87.2.18 2006/09/22 19:01:51 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.19 2006/09/25 17:28:20 andreas_kupries Exp $ # Current Tk version; used in various names. @@ -631,10 +631,9 @@ 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 vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { 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 "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > $(PKG_INDEX); \ fi |