summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2007-09-12 17:10:36 (GMT)
committerandreas_kupries <akupries@shaw.ca>2007-09-12 17:10:36 (GMT)
commit1733b54ed4d16d94de156fa0a6083fda7f2825f7 (patch)
tree527aa5d209ea36df97c31bb7cec7d29c557dfab1
parentcec014145c4587f8ae14e52119b6abdcc460f4d9 (diff)
downloadtk-1733b54ed4d16d94de156fa0a6083fda7f2825f7.zip
tk-1733b54ed4d16d94de156fa0a6083fda7f2825f7.tar.gz
tk-1733b54ed4d16d94de156fa0a6083fda7f2825f7.tar.bz2
* win/Makefile.in (install-binaries): Fixed missing brace in the
* win/makefile.vc (install-binaries): generated package index file. Note: unix/Makefile.in is good.
-rw-r--r--ChangeLog6
-rw-r--r--win/Makefile.in4
-rw-r--r--win/makefile.vc4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ff7d6fa..17f5879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-12 Andreas Kupries <andreask@activestate.com>
+
+ * win/Makefile.in (install-binaries): Fixed missing brace in the
+ * win/makefile.vc (install-binaries): generated package index file.
+ Note: unix/Makefile.in is good.
+
2007-09-11 Reinhard Max <max@suse.de>
* generic/tkImgGIF.c: Fixed a buffer overrun that got triggered by
diff --git a/win/Makefile.in b/win/Makefile.in
index 29c6d66..cc9f74b 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.74 2007/09/11 17:46:42 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.75 2007/09/12 17:10:38 andreas_kupries Exp $
TCLVERSION = @TCL_VERSION@
TCLPATCHL = @TCL_PATCH_LEVEL@
@@ -481,7 +481,7 @@ install-binaries: binaries
@$(RM) $(PKG_INDEX);
@(\
echo "if {[catch {package present Tcl\
- $(TCLVERSION)$(TCLPATCHL)]} { return }";\
+ $(TCLVERSION)$(TCLPATCHL)}]} { return }";\
echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\
[list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\
) > $(PKG_INDEX);
diff --git a/win/makefile.vc b/win/makefile.vc
index c3bca2a..e458adf 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.104 2007/09/11 17:46:42 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.105 2007/09/12 17:10:39 andreas_kupries Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -963,7 +963,7 @@ install-binaries:
!if !$(STATIC_BUILD)
@echo creating package index
@type << > $(OUT_DIR)\pkgIndex.tcl
-if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)]} { return }
+if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)}]} { return }
package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
<<
@$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\"