summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win/Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4abb019..27c78b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-23 Kevin B. Kenny <kennykb@acm.org>
+
+ * win/Makefile.in: Added code to keep a Cygwin path name from
+ leaking into LIBRARY_DIR when doing 'make test' or 'make runtest'.
+
2007-03-22 Don Porter <dgp@users.sourceforge.net>
* generic/tclCmdAH.c (Tcl_ForeachObjCmd): Replaced arrays
diff --git a/win/Makefile.in b/win/Makefile.in
index cbfe99e..ddcc921 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.114 2007/03/15 22:54:57 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.115 2007/03/23 18:45:40 kennykb Exp $
VERSION = @TCL_VERSION@
@@ -110,8 +110,8 @@ ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g')
# Fully qualify library path so that `make test`
# does not depend on the current directory.
-LIBRARY_DIR = $(shell cd '$(ROOT_DIR_NATIVE)/library' ; pwd)
-
+LIBRARY_DIR1 = $(shell cd '$(ROOT_DIR_NATIVE)/library' ; pwd)
+LIBRARY_DIR = $(shell $(CYGPATH) '$(LIBRARY_DIR1)' | sed 's!\\!/!g')
DLLSUFFIX = @DLLSUFFIX@
LIBSUFFIX = @LIBSUFFIX@
EXESUFFIX = @EXESUFFIX@