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 /win | |
| 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 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rw-r--r-- | win/makefile.vc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index af501d9..9cb4273 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.59.2.5 2006/09/22 19:01:52 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59.2.6 2006/09/25 17:28:21 andreas_kupries Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -427,8 +427,8 @@ install-binaries: binaries @$(RM) $(PKG_INDEX); @(\ echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)$(TCLPATCHL)\ + $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(VERSION)\ [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ diff --git a/win/makefile.vc b/win/makefile.vc index bea4261..bf0aeb0 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.67.2.15 2006/09/22 19:01:52 andreas_kupries Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.16 2006/09/25 17:28:21 andreas_kupries Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -542,8 +542,8 @@ install-binaries: !if !$(STATIC_BUILD) @echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" -del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" - echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" - echo package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" + echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" + echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" $(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\" !endif |