summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-03-29 23:02:42 (GMT)
committerhobbs <hobbs>2006-03-29 23:02:42 (GMT)
commit05b4cdd1912613766b7dfe0974122ba3876c07e7 (patch)
tree2d35ae4b60a134f514ec7da62d8567e00cbaa295
parent4fc1ccf0fbcec82d7f50f39beaeaf84b46388db7 (diff)
downloadtcl-05b4cdd1912613766b7dfe0974122ba3876c07e7.zip
tcl-05b4cdd1912613766b7dfe0974122ba3876c07e7.tar.gz
tcl-05b4cdd1912613766b7dfe0974122ba3876c07e7.tar.bz2
* win/Makefile.in: convert _NATIVE paths to use / to avoid ".\"
path-as-escape issue.
-rw-r--r--ChangeLog5
-rw-r--r--win/Makefile.in12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 95eec59..d04b5e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-29 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/Makefile.in: convert _NATIVE paths to use / to avoid ".\"
+ path-as-escape issue.
+
2006-03-29 Don Porter <dgp@users.sourceforge.net>
*** 8.5a4 TAGGED FOR RELEASE ***
diff --git a/win/Makefile.in b/win/Makefile.in
index 9e72d5d..0814370 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.99 2006/03/20 19:12:02 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.100 2006/03/29 23:02:42 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -109,12 +109,12 @@ COMPAT_DIR = @srcdir@/../compat
# Converts a POSIX path to a Windows native path.
CYGPATH = @CYGPATH@
-GENERIC_DIR_NATIVE = $(shell $(CYGPATH) '$(GENERIC_DIR)')
-TOMMATH_DIR_NATIVE = $(shell $(CYGPATH) '$(TOMMATH_DIR)')
-WIN_DIR_NATIVE = $(shell $(CYGPATH) '$(WIN_DIR)')
-ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's/\\*$$//' )
+GENERIC_DIR_NATIVE = $(shell $(CYGPATH) '$(GENERIC_DIR)' | sed 's!\\!/!g')
+TOMMATH_DIR_NATIVE = $(shell $(CYGPATH) '$(TOMMATH_DIR)' | sed 's!\\!/!g')
+WIN_DIR_NATIVE = $(shell $(CYGPATH) '$(WIN_DIR)' | sed 's!\\!/!g')
+ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g')
-LIBRARY_DIR = $(shell echo '$(ROOT_DIR_NATIVE)/library' | sed 's/\\/\//g' )
+LIBRARY_DIR = $(ROOT_DIR_NATIVE)/library
DLLSUFFIX = @DLLSUFFIX@
LIBSUFFIX = @LIBSUFFIX@