#i10000# - missed specific construct in #i70359# breaking 4nt build

10 files changed, 108 insertions, 108 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index b8ceb58400d1..4b5135b2c05a 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -128,7 +128,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP1TARGET).lnk
         -$(RM) $(MISC)\$(APP1TARGET).lst
@@ -297,7 +297,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP2TARGET).lnk
         -$(RM) $(MISC)\$(APP2TARGET).lst
@@ -466,7 +466,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP3TARGET).lnk
         -$(RM) $(MISC)\$(APP3TARGET).lst
@@ -635,7 +635,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP4TARGET).lnk
         -$(RM) $(MISC)\$(APP4TARGET).lst
@@ -804,7 +804,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP5TARGET).lnk
         -$(RM) $(MISC)\$(APP5TARGET).lst
@@ -973,7 +973,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP6TARGET).lnk
         -$(RM) $(MISC)\$(APP6TARGET).lst
@@ -1142,7 +1142,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP7TARGET).lnk
         -$(RM) $(MISC)\$(APP7TARGET).lst
@@ -1311,7 +1311,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP8TARGET).lnk
         -$(RM) $(MISC)\$(APP8TARGET).lst
@@ -1480,7 +1480,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP9TARGET).lnk
         -$(RM) $(MISC)\$(APP9TARGET).lst
@@ -1649,7 +1649,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP10TARGET).lnk
         -$(RM) $(MISC)\$(APP10TARGET).lst
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 2fd7b0d1788e..8b06efe5f354 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -10,7 +10,7 @@ RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -88,7 +88,7 @@ RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -166,7 +166,7 @@ RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -244,7 +244,7 @@ RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -322,7 +322,7 @@ RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -400,7 +400,7 @@ RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -478,7 +478,7 @@ RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -556,7 +556,7 @@ RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -634,7 +634,7 @@ RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RES
 $(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
@@ -712,7 +712,7 @@ RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RE
 $(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 488424ce47c0..2feeb29bbe65 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -283,7 +283,7 @@ $(SHL1TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
@@ -301,7 +301,7 @@ $(SHL1TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL1USE_EXPORTS)"!="name"
     $(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
@@ -318,7 +318,7 @@ $(SHL1TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL1USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL1TARGET).lnk
@@ -339,7 +339,7 @@ $(SHL1TARGETN) : \
         $(SHL1LINKER) @$(MISC)$/$(SHL1TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -693,7 +693,7 @@ $(SHL2TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
@@ -711,7 +711,7 @@ $(SHL2TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL2USE_EXPORTS)"!="name"
     $(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
@@ -728,7 +728,7 @@ $(SHL2TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL2USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL2TARGET).lnk
@@ -749,7 +749,7 @@ $(SHL2TARGETN) : \
         $(SHL2LINKER) @$(MISC)$/$(SHL2TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1103,7 +1103,7 @@ $(SHL3TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
@@ -1121,7 +1121,7 @@ $(SHL3TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL3USE_EXPORTS)"!="name"
     $(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
@@ -1138,7 +1138,7 @@ $(SHL3TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL3USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL3TARGET).lnk
@@ -1159,7 +1159,7 @@ $(SHL3TARGETN) : \
         $(SHL3LINKER) @$(MISC)$/$(SHL3TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1513,7 +1513,7 @@ $(SHL4TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
@@ -1531,7 +1531,7 @@ $(SHL4TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL4USE_EXPORTS)"!="name"
     $(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
@@ -1548,7 +1548,7 @@ $(SHL4TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL4USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL4TARGET).lnk
@@ -1569,7 +1569,7 @@ $(SHL4TARGETN) : \
         $(SHL4LINKER) @$(MISC)$/$(SHL4TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1923,7 +1923,7 @@ $(SHL5TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
@@ -1941,7 +1941,7 @@ $(SHL5TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL5USE_EXPORTS)"!="name"
     $(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
@@ -1958,7 +1958,7 @@ $(SHL5TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL5USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL5TARGET).lnk
@@ -1979,7 +1979,7 @@ $(SHL5TARGETN) : \
         $(SHL5LINKER) @$(MISC)$/$(SHL5TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -2333,7 +2333,7 @@ $(SHL6TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
@@ -2351,7 +2351,7 @@ $(SHL6TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL6USE_EXPORTS)"!="name"
     $(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
@@ -2368,7 +2368,7 @@ $(SHL6TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL6USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL6TARGET).lnk
@@ -2389,7 +2389,7 @@ $(SHL6TARGETN) : \
         $(SHL6LINKER) @$(MISC)$/$(SHL6TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -2743,7 +2743,7 @@ $(SHL7TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
@@ -2761,7 +2761,7 @@ $(SHL7TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL7USE_EXPORTS)"!="name"
     $(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
@@ -2778,7 +2778,7 @@ $(SHL7TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL7USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL7TARGET).lnk
@@ -2799,7 +2799,7 @@ $(SHL7TARGETN) : \
         $(SHL7LINKER) @$(MISC)$/$(SHL7TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -3153,7 +3153,7 @@ $(SHL8TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
@@ -3171,7 +3171,7 @@ $(SHL8TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL8USE_EXPORTS)"!="name"
     $(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
@@ -3188,7 +3188,7 @@ $(SHL8TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL8USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL8TARGET).lnk
@@ -3209,7 +3209,7 @@ $(SHL8TARGETN) : \
         $(SHL8LINKER) @$(MISC)$/$(SHL8TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -3563,7 +3563,7 @@ $(SHL9TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
@@ -3581,7 +3581,7 @@ $(SHL9TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL9USE_EXPORTS)"!="name"
     $(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
@@ -3598,7 +3598,7 @@ $(SHL9TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL9USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL9TARGET).lnk
@@ -3619,7 +3619,7 @@ $(SHL9TARGETN) : \
         $(SHL9LINKER) @$(MISC)$/$(SHL9TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -3973,7 +3973,7 @@ $(SHL10TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
@@ -3991,7 +3991,7 @@ $(SHL10TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL10USE_EXPORTS)"!="name"
     $(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
@@ -4008,7 +4008,7 @@ $(SHL10TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL10USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL10TARGET).lnk
@@ -4029,7 +4029,7 @@ $(SHL10TARGETN) : \
         $(SHL10LINKER) @$(MISC)$/$(SHL10TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 551391e5e1b2..c272bbc14932 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: pstrules.mk,v $
 #
-#   $Revision: 1.44 $
+#   $Revision: 1.45 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:52:21 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:02 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -51,7 +51,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
      $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
-     @$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(FI)
+     @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
     $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
 .ENDIF
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 0424ab7c14f6..fd4304f06944 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.82 $
+#   $Revision: 1.83 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:52:35 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:35 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -495,12 +495,12 @@ $(SLO)$/%.obj : %.asm
        @echo Making: $@
 .IF "$(COM)"=="WTC"
         $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)$/$*.obj
-        -$(IFEXIST) $*.err $(THEN) $(RM) $*.err $(FI)
+        -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE
 .IF "$(COM)"=="MSC"
 .IF "$(ASM)"=="ml"
     $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
-    -$(IFEXIST) $*.err $(THEN) $(RM) $*.err $(FI)
+    -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE			# "$(ASM)"=="ml"
     @-$(RM) $@ >& $(NULLDEV)
     $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
@@ -514,9 +514,9 @@ $(OBJ)$/%.obj : %.asm
 .IF "$(COM)"=="MSC"
 .IF "$(ASM)"=="ml"
     $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
-    -$(IFEXIST) $*.err $(THEN) $(RM) $*.err $(FI)
+    -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
 .ELSE			# "$(ASM)"=="ml"
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
     $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ENDIF			 "$(COM)"=="MSC"
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 5951b62533a9..9051188aa1f5 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.189 $
+#   $Revision: 1.190 $
 #
-#   last change: $Author: hjs $ $Date: 2007-01-25 18:22:07 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:26 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -1770,7 +1770,7 @@ $(MISC)$/$(TARGET)_%.done : %.xrb
 $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
         @echo ------------------------------
         @echo Making: $@
-        @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+        @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
         $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
         @$(RENAME) $@.$(ROUT).tmp $@
 .ENDIF	    
@@ -2035,24 +2035,24 @@ OTHERTARGET : $(OTHER)
 
 killbin:
 .IF "$(GUI)"=="WNT"
-    @$(IFEXIST) $(BIN)$/$(SHL1TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL1TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL2TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL2TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL3TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL3TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL4TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL5TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL6TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL7TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL8TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM) $(BIN)$/$(SHL9TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL1TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL2TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL3TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL4TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL5TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL6TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL7TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL8TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL9TARGET).dll $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI)
+    @$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI)
 
 .ELSE			# "$(GUI)"=="WNT"
 .IF "$(SHL1TARGET)"!=""
@@ -2268,7 +2268,7 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
 $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
     @echo Making $@ :
     @echo ---------------
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
     @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010> $@.$(ROUT).tmp
     $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | $(SORT) -u >> $@.$(ROUT).tmp 
     @$(RENAME) $@.$(ROUT).tmp $@
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 652373144a45..d4d852e1cea3 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: tg_app.mk,v $
 #
-#   $Revision: 1.60 $
+#   $Revision: 1.61 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:53:15 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:51 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -165,7 +165,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         )
     @-echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ELSE
         -$(RM) $(MISC)\$(APP$(TNR)TARGET).lnk
         -$(RM) $(MISC)\$(APP$(TNR)TARGET).lst
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 2fa921f57882..82ed47b58792 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: tg_dep.mk,v $
 #
-#   $Revision: 1.25 $
+#   $Revision: 1.26 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:54:21 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:19 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,7 @@
 .IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HXX1TARGET)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
 ALLDEP .PHONY: 
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-    @-$(IFEXIST) $(SRS)$/$(PWD:f).*.dpr $(THEN) $(RM) $(SRS)$/$(PWD:f).*.dpr >& $(NULLDEV) $(FI)
+    @-$(IFEXIST) $(SRS)$/$(PWD:f).*.dpr $(THEN) $(RM:s/+//) $(SRS)$/$(PWD:f).*.dpr >& $(NULLDEV) $(FI)
 .ELSE
     @-$(RM) $(SRS)$/$(PWD:f).*.dpr >& $(NULLDEV)
 .ENDIF
@@ -98,8 +98,8 @@ ALLDPC: \
 .ENDIF
 .ENDIF
 .IF "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)$(PARFILES)"!=""
-    @$(IFEXIST) $(MISC)$/$(TARGET).dpj $(THEN) $(RM) $(MISC)$/$(TARGET).dpj >& $(NULLDEV) $(FI)
-    @$(IFEXIST) $(MISC)$/genjava.mk $(THEN) $(RM) $(MISC)$/genjava.mk >& $(NULLDEV) $(FI)
+    @$(IFEXIST) $(MISC)$/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)$/$(TARGET).dpj >& $(NULLDEV) $(FI)
+    @$(IFEXIST) $(MISC)$/genjava.mk $(THEN) $(RM:s/+//) $(MISC)$/genjava.mk >& $(NULLDEV) $(FI)
     $(TOUCH) $(MISC)$/$(TARGET).dpc
 .IF "$($(SECOND_BUILD)_SLOFILES)"!=""
     @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index a5e1e28d8b6f..9d7a5c042d2d 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: tg_rslb.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:56:23 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:59:05 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,7 @@ RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid
 $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
     @echo ------------------------------
     @echo Making: $@
-    @$(IFEXIST) $@ $(THEN) $(RM) $@ $(FI)
+    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
 # need to strip since solaris cannot handle tab-only whitespace here
     $(TYPE) $(mktmp  $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
     @$(RENAME) $@.$(ROUT).tmp $@
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 00a068a1edbb..ed93eeb350ea 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: tg_shl.mk,v $
 #
-#   $Revision: 1.103 $
+#   $Revision: 1.104 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:57:00 $
+#   last change: $Author: hjs $ $Date: 2007-01-26 10:58:42 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -320,7 +320,7 @@ $(SHL$(TNR)TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(COM)"=="GCC"
 .ELSE			# "$(USE_DEFFILE)"!=""
     $(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
@@ -338,7 +338,7 @@ $(SHL$(TNR)TARGETN) : \
     @$(LS) $@ >& $(NULLDEV)
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
     $(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
@@ -355,7 +355,7 @@ $(SHL$(TNR)TARGETN) : \
     )
     @echo linking $@.manifest ...
     $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-    $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+    $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
 .ELSE			# "$(linkinc)"==""
         -$(RM) del $(MISC)$/$(SHL$(TNR)TARGET).lnk
@@ -376,7 +376,7 @@ $(SHL$(TNR)TARGETN) : \
         $(SHL$(TNR)LINKER) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
         @echo linking $@.manifest ...
         $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-        $(IFEXIST) $@.manifest $(THEN) $(RM) $@.manifest $(FI)
+        $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"