Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -708,17 +708,17 @@
 #---------------------------------------------------------------------
 # Regenerate the stubs files.  [Development use only]
 #---------------------------------------------------------------------
 
 genstubs:
-!if !exist($(TCLSH))
+!if !exist($(TCLSH_NATIVE))
 	@echo Build tclsh first!
 !else
-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+	$(TCLSH_NATIVE) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
 		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
 		$(GENERICDIR:\=/)/tclTomMath.decls
-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+	$(TCLSH_NATIVE) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
 		$(GENERICDIR:\=/)/tclOO.decls
 !endif
 
 
 #----------------------------------------------------------------------
@@ -726,14 +726,14 @@
 # It needs to be run (and the results checked) after updating
 # to a new release of libtommath.
 #----------------------------------------------------------------------
 
 gentommath_h:
-!if !exist($(TCLSH))
+!if !exist($(TCLSH_NATIVE))
 	@echo Build tclsh first!
 !else
-	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
+	$(TCLSH_NATIVE) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
 		"$(TOMMATHDIR:\=/)/tommath.h" \
 		> "$(GENERICDIR)\tclTomMath.h"
 !endif
 
 #---------------------------------------------------------------------
@@ -750,11 +750,11 @@
 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 
 htmlhelp: chmsetup $(CHMFILE)
 
 $(CHMFILE): $(DOCDIR)\*
-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
+	@$(TCLSH_NATIVE) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
 	@echo Compiling HTML help project
 	-$(HHC) <<$(HHPFILE) >NUL
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
@@ -834,11 +834,11 @@
 	$(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c
 	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
 	$(_VC_MANIFEST_EMBED_EXE)
 
 $(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
-	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
+	$(TCLSH_NATIVE) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
 
 install-docs:
 !if exist("$(CHMFILE)")
 	@echo Installing compiled HTML help
 	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
@@ -1016,14 +1016,14 @@
 # tclCompile.h was changed.  These rules aren't needed when building
 # from scratch.
 #---------------------------------------------------------------------
 
 depend:
-!if !exist($(TCLSH))
+!if !exist($(TCLSH_NATIVE))
 	@echo Build tclsh first!
 !else
-	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+	$(TCLSH_NATIVE) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
 		-passthru:"-DBUILD_tcl $(TCL_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
 		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
 $(TCLOBJS)
 <<
 !endif