summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
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 /win/Makefile.in
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].
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in3
1 files changed, 2 insertions, 1 deletions
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)\