diff options
| author | andreas_kupries <akupries@shaw.ca> | 2006-09-27 18:43:35 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2006-09-27 18:43:35 (GMT) |
| commit | 79e0492ccc5fa09d42f26d73e401e7d4ecc6a3dd (patch) | |
| tree | 97d84f96b7f3dff90ccda6a66f747ac34977593f /unix | |
| parent | 0cbae2255aa4378510703eb4e1b6fe4aedb2e4d9 (diff) | |
| download | tk-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 'unix')
| -rw-r--r-- | unix/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
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 ".."}}'`;\ |