From 951791b64cbd1a79f2c1fe704f3ce406e83d5dce Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 26 Jul 2012 22:17:03 +0000
Subject: use forward slashes in $ROOT, whenever the path is handled by
 tclsh/tcltest fix TCL_LIBRARY value in "test-core" rule

---
 win/makefile.vc | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index 5183504..4c93069 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -564,15 +564,15 @@ install:    install-binaries install-libraries install-docs install-pkgs
 
 test: test-core test-pkgs
 test-core: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT:\=/)/../library
+	set TCL_LIBRARY=$(ROOT:\=/)/library
 !if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
-	$(DEBUGGER) $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
+	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
 		set ::ddelib [file normalize $(TCLDDELIB:\=/)]
 		set ::reglib [file normalize $(TCLREGLIB:\=/)]
 <<
 !else
 	@echo Please wait while the tests are collected...
-	$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
+	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
 		set ::ddelib [file normalize $(TCLDDELIB:\=/)]
 		set ::reglib [file normalize $(TCLREGLIB:\=/)]
 <<
@@ -580,11 +580,11 @@ test-core: setup $(TCLTEST) dlls $(CAT32)
 !endif
 
 runtest: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT)/library
+	set TCL_LIBRARY=$(ROOT:\=/)/library
 	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
 
 runshell: setup $(TCLSH) dlls
-	set TCL_LIBRARY=$(ROOT)/library
+	set TCL_LIBRARY=$(ROOT:\=/)/library
 	$(DEBUGGER) $(TCLSH) $(SCRIPT)
 
 setup:
@@ -819,7 +819,6 @@ install-docs:
 	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
 !endif
 
-#"
 #---------------------------------------------------------------------
 # Build tclConfig.sh for the TEA build system.
 #---------------------------------------------------------------------
@@ -1158,15 +1157,15 @@ install-libraries: tclConfig install-msgs install-tzdata
 
 install-tzdata:
 	@echo Installing time zone data
-	@set TCL_LIBRARY=$(ROOT)/library
-	@$(TCLSH_NATIVE) "$(ROOT)/tools/installData.tcl" \
-	    "$(ROOT)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
 
 install-msgs:
 	@echo Installing message catalogs
-	@set TCL_LIBRARY=$(ROOT)/library
-	@$(TCLSH_NATIVE) "$(ROOT)/tools/installData.tcl" \
-	    "$(ROOT)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
 
 #---------------------------------------------------------------------
 # Clean up
-- 
cgit v0.12