INTEGRATION: CWS basmgr02 (1.32.2); FILE MERGED

1 files changed, 40 insertions, 40 deletions

diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 4e035aea6e28..f8c48021b7a6 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -28,7 +28,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK1:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
@@ -42,7 +42,7 @@ BUILD_DRIVE1:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE1)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT1_PROTECT=$(TMP)$/$(DEF1UNIQE:b).bat &&
-RMHACK1:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE1)"=="O"
 .ENDIF			# "$(BUILD_DRIVE1)"=="O"
 
@@ -83,14 +83,14 @@ $(DEF1TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL1DESCRIPTION)"==""
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(SHL1USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
+    @-$(EXPORT1_PROTECT) $(RMHACK) $(MISC)$/$(SHL1TARGET).exp
     @$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
 .IF "$(DEF1CEXP)"!=""
     @$(EXPORT1_PROTECT) $(LDUMP2) -A $(DEF1CEXP) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT1_PROTECT) $(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
+    $(EXPORT1_PROTECT) $(RMHACK) $(MISC)$/$(SHL1TARGET).exp
 .ELSE			# "$(SHL1USE_EXPORTS)"!="ordinal"
     @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB1NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL1TARGET).direct
 .IF "$(DEF1CEXP)"!=""
@@ -222,7 +222,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK2:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
@@ -236,7 +236,7 @@ BUILD_DRIVE2:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE2)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT2_PROTECT=$(TMP)$/$(DEF2UNIQE:b).bat &&
-RMHACK2:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE2)"=="O"
 .ENDIF			# "$(BUILD_DRIVE2)"=="O"
 
@@ -277,14 +277,14 @@ $(DEF2TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL2DESCRIPTION)"==""
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(SHL2USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT2_PROTECT) $(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
+    @-$(EXPORT2_PROTECT) $(RMHACK) $(MISC)$/$(SHL2TARGET).exp
     @$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
 .IF "$(DEF2CEXP)"!=""
     @$(EXPORT2_PROTECT) $(LDUMP2) -A $(DEF2CEXP) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT2_PROTECT) $(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
+    $(EXPORT2_PROTECT) $(RMHACK) $(MISC)$/$(SHL2TARGET).exp
 .ELSE			# "$(SHL2USE_EXPORTS)"!="ordinal"
     @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB2NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL2TARGET).direct
 .IF "$(DEF2CEXP)"!=""
@@ -416,7 +416,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK3:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
@@ -430,7 +430,7 @@ BUILD_DRIVE3:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE3)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT3_PROTECT=$(TMP)$/$(DEF3UNIQE:b).bat &&
-RMHACK3:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE3)"=="O"
 .ENDIF			# "$(BUILD_DRIVE3)"=="O"
 
@@ -471,14 +471,14 @@ $(DEF3TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL3DESCRIPTION)"==""
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(SHL3USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT3_PROTECT) $(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
+    @-$(EXPORT3_PROTECT) $(RMHACK) $(MISC)$/$(SHL3TARGET).exp
     @$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
 .IF "$(DEF3CEXP)"!=""
     @$(EXPORT3_PROTECT) $(LDUMP2) -A $(DEF3CEXP) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT3_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT3_PROTECT) $(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
+    $(EXPORT3_PROTECT) $(RMHACK) $(MISC)$/$(SHL3TARGET).exp
 .ELSE			# "$(SHL3USE_EXPORTS)"!="ordinal"
     @$(EXPORT3_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB3NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL3TARGET).direct
 .IF "$(DEF3CEXP)"!=""
@@ -610,7 +610,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK4:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
@@ -624,7 +624,7 @@ BUILD_DRIVE4:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE4)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT4_PROTECT=$(TMP)$/$(DEF4UNIQE:b).bat &&
-RMHACK4:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE4)"=="O"
 .ENDIF			# "$(BUILD_DRIVE4)"=="O"
 
@@ -665,14 +665,14 @@ $(DEF4TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL4DESCRIPTION)"==""
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(SHL4USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT4_PROTECT) $(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
+    @-$(EXPORT4_PROTECT) $(RMHACK) $(MISC)$/$(SHL4TARGET).exp
     @$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
 .IF "$(DEF4CEXP)"!=""
     @$(EXPORT4_PROTECT) $(LDUMP2) -A $(DEF4CEXP) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT4_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT4_PROTECT) $(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
+    $(EXPORT4_PROTECT) $(RMHACK) $(MISC)$/$(SHL4TARGET).exp
 .ELSE			# "$(SHL4USE_EXPORTS)"!="ordinal"
     @$(EXPORT4_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB4NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL4TARGET).direct
 .IF "$(DEF4CEXP)"!=""
@@ -804,7 +804,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK5:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
@@ -818,7 +818,7 @@ BUILD_DRIVE5:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE5)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT5_PROTECT=$(TMP)$/$(DEF5UNIQE:b).bat &&
-RMHACK5:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE5)"=="O"
 .ENDIF			# "$(BUILD_DRIVE5)"=="O"
 
@@ -859,14 +859,14 @@ $(DEF5TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL5DESCRIPTION)"==""
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(SHL5USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT5_PROTECT) $(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
+    @-$(EXPORT5_PROTECT) $(RMHACK) $(MISC)$/$(SHL5TARGET).exp
     @$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
 .IF "$(DEF5CEXP)"!=""
     @$(EXPORT5_PROTECT) $(LDUMP2) -A $(DEF5CEXP) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT5_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT5_PROTECT) $(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
+    $(EXPORT5_PROTECT) $(RMHACK) $(MISC)$/$(SHL5TARGET).exp
 .ELSE			# "$(SHL5USE_EXPORTS)"!="ordinal"
     @$(EXPORT5_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB5NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL5TARGET).direct
 .IF "$(DEF5CEXP)"!=""
@@ -998,7 +998,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK6:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
@@ -1012,7 +1012,7 @@ BUILD_DRIVE6:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE6)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT6_PROTECT=$(TMP)$/$(DEF6UNIQE:b).bat &&
-RMHACK6:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE6)"=="O"
 .ENDIF			# "$(BUILD_DRIVE6)"=="O"
 
@@ -1053,14 +1053,14 @@ $(DEF6TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL6DESCRIPTION)"==""
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(SHL6USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT6_PROTECT) $(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
+    @-$(EXPORT6_PROTECT) $(RMHACK) $(MISC)$/$(SHL6TARGET).exp
     @$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
 .IF "$(DEF6CEXP)"!=""
     @$(EXPORT6_PROTECT) $(LDUMP2) -A $(DEF6CEXP) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT6_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT6_PROTECT) $(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
+    $(EXPORT6_PROTECT) $(RMHACK) $(MISC)$/$(SHL6TARGET).exp
 .ELSE			# "$(SHL6USE_EXPORTS)"!="ordinal"
     @$(EXPORT6_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB6NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL6TARGET).direct
 .IF "$(DEF6CEXP)"!=""
@@ -1192,7 +1192,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK7:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
@@ -1206,7 +1206,7 @@ BUILD_DRIVE7:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE7)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT7_PROTECT=$(TMP)$/$(DEF7UNIQE:b).bat &&
-RMHACK7:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE7)"=="O"
 .ENDIF			# "$(BUILD_DRIVE7)"=="O"
 
@@ -1247,14 +1247,14 @@ $(DEF7TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL7DESCRIPTION)"==""
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(SHL7USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT7_PROTECT) $(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
+    @-$(EXPORT7_PROTECT) $(RMHACK) $(MISC)$/$(SHL7TARGET).exp
     @$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
 .IF "$(DEF7CEXP)"!=""
     @$(EXPORT7_PROTECT) $(LDUMP2) -A $(DEF7CEXP) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT7_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT7_PROTECT) $(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
+    $(EXPORT7_PROTECT) $(RMHACK) $(MISC)$/$(SHL7TARGET).exp
 .ELSE			# "$(SHL7USE_EXPORTS)"!="ordinal"
     @$(EXPORT7_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB7NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL7TARGET).direct
 .IF "$(DEF7CEXP)"!=""
@@ -1386,7 +1386,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK8:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
@@ -1400,7 +1400,7 @@ BUILD_DRIVE8:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE8)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT8_PROTECT=$(TMP)$/$(DEF8UNIQE:b).bat &&
-RMHACK8:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE8)"=="O"
 .ENDIF			# "$(BUILD_DRIVE8)"=="O"
 
@@ -1441,14 +1441,14 @@ $(DEF8TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL8DESCRIPTION)"==""
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(SHL8USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT8_PROTECT) $(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
+    @-$(EXPORT8_PROTECT) $(RMHACK) $(MISC)$/$(SHL8TARGET).exp
     @$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
 .IF "$(DEF8CEXP)"!=""
     @$(EXPORT8_PROTECT) $(LDUMP2) -A $(DEF8CEXP) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT8_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT8_PROTECT) $(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
+    $(EXPORT8_PROTECT) $(RMHACK) $(MISC)$/$(SHL8TARGET).exp
 .ELSE			# "$(SHL8USE_EXPORTS)"!="ordinal"
     @$(EXPORT8_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB8NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL8TARGET).direct
 .IF "$(DEF8CEXP)"!=""
@@ -1580,7 +1580,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK9:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
@@ -1594,7 +1594,7 @@ BUILD_DRIVE9:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE9)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT9_PROTECT=$(TMP)$/$(DEF9UNIQE:b).bat &&
-RMHACK9:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE9)"=="O"
 .ENDIF			# "$(BUILD_DRIVE9)"=="O"
 
@@ -1635,14 +1635,14 @@ $(DEF9TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL9DESCRIPTION)"==""
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(SHL9USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT9_PROTECT) $(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
+    @-$(EXPORT9_PROTECT) $(RMHACK) $(MISC)$/$(SHL9TARGET).exp
     @$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
 .IF "$(DEF9CEXP)"!=""
     @$(EXPORT9_PROTECT) $(LDUMP2) -A $(DEF9CEXP) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT9_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT9_PROTECT) $(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
+    $(EXPORT9_PROTECT) $(RMHACK) $(MISC)$/$(SHL9TARGET).exp
 .ELSE			# "$(SHL9USE_EXPORTS)"!="ordinal"
     @$(EXPORT9_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB9NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL9TARGET).direct
 .IF "$(DEF9CEXP)"!=""
@@ -1774,7 +1774,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
 
-RMHACK10:=$(RM)
+RMHACK:=$(RM)
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
@@ -1788,7 +1788,7 @@ BUILD_DRIVE10:=$(shell echo %_disk)
 .IF "$(BUILD_DRIVE10)"=="O"
 # in case of RE build, protect against failed lock
 EXPORT10_PROTECT=$(TMP)$/$(DEF10UNIQE:b).bat &&
-RMHACK10:=$(RM:s/+//)
+RMHACK:=$(RM:s/+//)
 .ELSE			# "$(BUILD_DRIVE10)"=="O"
 .ENDIF			# "$(BUILD_DRIVE10)"=="O"
 
@@ -1829,14 +1829,14 @@ $(DEF10TARGETN) .PHONY :
 .ENDIF			# "$(NO_SHL10DESCRIPTION)"==""
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(SHL10USE_EXPORTS)"!="ordinal"
-    @-$(EXPORT10_PROTECT) $(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
+    @-$(EXPORT10_PROTECT) $(RMHACK) $(MISC)$/$(SHL10TARGET).exp
     @$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
 .IF "$(DEF10CEXP)"!=""
     @$(EXPORT10_PROTECT) $(LDUMP2) -A $(DEF10CEXP) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
 .ELSE
     @$(EXPORT10_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
 .ENDIF
-    $(EXPORT10_PROTECT) $(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
+    $(EXPORT10_PROTECT) $(RMHACK) $(MISC)$/$(SHL10TARGET).exp
 .ELSE			# "$(SHL10USE_EXPORTS)"!="ordinal"
     @$(EXPORT10_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB10NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL10TARGET).direct
 .IF "$(DEF10CEXP)"!=""