Index: solenv/inc/wnt.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wnt.mk,v
retrieving revision 1.38.2.1
diff -u -r1.38.2.1 wnt.mk
--- solenv/inc/wnt.mk	27 Sep 2002 12:51:21 -0000	1.38.2.1
+++ solenv/inc/wnt.mk	26 Oct 2002 22:18:44 -0000
@@ -238,7 +238,8 @@
 .IF "$(USE_SHELL)"=="4nt"
 CXX=cl
 .ELSE			# "$(USE_SHELL)"=="4nt"
-CXX=guw.pl cl
+CC!:=guw.pl $(CC)
+CXX!:=guw.pl $(CXX)
 .ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF
 .ENDIF
@@ -546,7 +547,10 @@
 SCPLINK=guw.pl scplink
 LZIP=guw.pl -env lzip
 CPPLCC=guw.pl cpplcc
-MAKEDEPEND=guw.pl makedepend
+#MAKEDEPEND is already defined in unitools.mk
+MAKEDEPEND!:=guw.pl $(MAKEDEPEND)
+#For generic use where a wrapper is needed
+WRAPPERCMD=guw.pl
 .ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF
 .ENDIF              # "$(COM)"=="MSC"