summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2006-09-27 18:43:35 (GMT)
committerandreas_kupries <akupries@shaw.ca>2006-09-27 18:43:35 (GMT)
commit79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd (patch)
tree97d84f96b7f3dff90ccda6a66f747ac34977593f
parent0cbae2255aa4378510703eb4e1b6fe4aedb2e4d9 (diff)
downloadtk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.zip
tk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.tar.gz
tk-79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd.tar.bz2
* unix/Makefile.in (install-binaries): Added a second guard to the
* win/Makefile.in: package index file to prevent older versions of * win/makefile.vc: Tcl from seeing version numbers which may contain a/b information, and then balking on them. This could otherwise happen when Tcl/Tk 8.4 and 8.5 are installed in the same directory, seeing each other. [SF Tk Bug 1566418].
-rw-r--r--ChangeLog9
-rw-r--r--unix/Makefile.in3
-rw-r--r--win/Makefile.in3
-rw-r--r--win/makefile.vc5
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c950dfb..de88899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-27 Andreas Kupries <andreask@activestate.com>
+
+ * unix/Makefile.in (install-binaries): Added a second guard to the
+ * win/Makefile.in: package index file to prevent older versions of
+ * win/makefile.vc: Tcl from seeing version numbers which may
+ contain a/b information, and then balking on them. This could
+ otherwise happen when Tcl/Tk 8.4 and 8.5 are installed in the
+ same directory, seeing each other. [SF Tk Bug 1566418].
+
2006-09-22 Andreas Kupries <andreask@activestate.com>
* generic/tkConsole.c: TIP #268 update regarding registered package
diff --git a/unix/Makefile.in b/unix/Makefile.in
index cf14670..f339bb7 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.115 2006/09/22 19:02:07 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.116 2006/09/27 18:43:35 andreas_kupries Exp $
# Current Tk version; used in various names.
@@ -643,6 +643,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 {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\
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 ".."}}'`;\
diff --git a/win/Makefile.in b/win/Makefile.in
index 58c26ab..a2ac0c2 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.68 2006/09/22 19:02:08 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.69 2006/09/27 18:43:35 andreas_kupries Exp $
TCLVERSION = @TCL_VERSION@
TCLPATCHL = @TCL_PATCH_LEVEL@
@@ -436,6 +436,7 @@ 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)\
diff --git a/win/makefile.vc b/win/makefile.vc
index 59ca458..c9e622f 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.93 2006/09/22 19:02:08 andreas_kupries Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.94 2006/09/27 18:43:35 andreas_kupries Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -842,7 +842,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 if {![package vsatisfies [package provide Tcl] $(TCL_DOTVERSION)]} { return } > "$(OUT_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"
$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
!endif