summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2004-06-23 19:23:46 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2004-06-23 19:23:46 (GMT)
commit8e3e8b6771a4626230448ac7665c08b623812c2e (patch)
tree74a5aead902680def2966b2a1a9d4343b4b079dc
parent4e17f9b10b636f4302f62dfb464551aa3cc2a003 (diff)
downloadtcl-8e3e8b6771a4626230448ac7665c08b623812c2e.zip
tcl-8e3e8b6771a4626230448ac7665c08b623812c2e.tar.gz
tcl-8e3e8b6771a4626230448ac7665c08b623812c2e.tar.bz2
* win/makefile.vc: fix for bug #977369 about launching tclsh to
generate a tclConfig.sh with the nmake build system
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84562c5..49af176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-23 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/makefile.vc: fix for bug #977369 about launching tclsh to
+ generate a tclConfig.sh with the nmake build system
+
2004-06-23 Kevin B. Kenny <kennykb@acm.org>
* tests/winDde.test (createChildProcess): Added a 200-ms delay
diff --git a/win/makefile.vc b/win/makefile.vc
index 9886361..611702d 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.127 2004/06/01 08:18:32 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.128 2004/06/23 19:23:49 patthoyts Exp $
#------------------------------------------------------------------------------
!if !defined(MSDEVDIR) && !defined(MSVCDIR)
@@ -179,7 +179,7 @@ DOTVERSION = 8.6
DOTVERSION = 9.0
!elseif [nmakehlp -g ../generic/tcl.h TCL_VERSION] == 0
MSG =^
-Can't get version string from ../generic/tcl.h
+Cannot get version string from ../generic/tcl.h
!error $(MSG)
!endif
VERSION = $(DOTVERSION:.=)
@@ -569,6 +569,7 @@ $(TCLOBJS)
<<
!endif
+#" for emacs font-locking.
#---------------------------------------------------------------------
# Build the windows help file.
@@ -643,6 +644,7 @@ tclConfig:
@echo Build tclsh first!
!else
@echo Creating tclConfig.sh
+ set TCL_LIBRARY=$(ROOT)/library
@$(TCLSH) <<
set debug $(DEBUG)
set thread $(TCL_THREADS)