#i10000# Last change didn't work correctly in hamburg windows environment.

1 files changed, 60 insertions, 60 deletions

diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index c62f249c422a..880b23097af5 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -26,7 +26,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
 
@@ -43,7 +43,7 @@ EXPORT1_PROTECT=$(TMP)$/$(DEF1UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB1NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP1HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -55,7 +55,7 @@ $(DEF1TARGETN) .PHONY : \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(BUILD_DRIVE1)"=="O"
@@ -66,7 +66,7 @@ $(DEF1TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE1)"=="O"
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -93,7 +93,7 @@ $(DEF1TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT1_PROTECT) $(RM) $(SHL1TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE1)"=="O"
 #
@@ -103,7 +103,7 @@ $(DEF1TARGETN) .PHONY : \
     +$(TMP)$/$(DEF1UNIQE:b).bat && $(RM) $(TMP)$/$(DEF1UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE1)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 .IF "$(DEF1EXPORT1)"!=""
     @echo $(DEF1EXPORT1)										>>$@
@@ -212,7 +212,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
 
@@ -229,7 +229,7 @@ EXPORT2_PROTECT=$(TMP)$/$(DEF2UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB2NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP2HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -241,7 +241,7 @@ $(DEF2TARGETN) .PHONY : \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(BUILD_DRIVE2)"=="O"
@@ -252,7 +252,7 @@ $(DEF2TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE2)"=="O"
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -279,7 +279,7 @@ $(DEF2TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT2_PROTECT) $(RM) $(SHL2TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE2)"=="O"
 #
@@ -289,7 +289,7 @@ $(DEF2TARGETN) .PHONY : \
     +$(TMP)$/$(DEF2UNIQE:b).bat && $(RM) $(TMP)$/$(DEF2UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE2)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 .IF "$(DEF2EXPORT1)"!=""
     @echo $(DEF2EXPORT1)										>>$@
@@ -398,7 +398,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
 
@@ -415,7 +415,7 @@ EXPORT3_PROTECT=$(TMP)$/$(DEF3UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB3NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP3HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -427,7 +427,7 @@ $(DEF3TARGETN) .PHONY : \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(BUILD_DRIVE3)"=="O"
@@ -438,7 +438,7 @@ $(DEF3TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE3)"=="O"
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -465,7 +465,7 @@ $(DEF3TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT3_PROTECT) $(RM) $(SHL3TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE3)"=="O"
 #
@@ -475,7 +475,7 @@ $(DEF3TARGETN) .PHONY : \
     +$(TMP)$/$(DEF3UNIQE:b).bat && $(RM) $(TMP)$/$(DEF3UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE3)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 .IF "$(DEF3EXPORT1)"!=""
     @echo $(DEF3EXPORT1)										>>$@
@@ -584,7 +584,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
 
@@ -601,7 +601,7 @@ EXPORT4_PROTECT=$(TMP)$/$(DEF4UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB4NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP4HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -613,7 +613,7 @@ $(DEF4TARGETN) .PHONY : \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(BUILD_DRIVE4)"=="O"
@@ -624,7 +624,7 @@ $(DEF4TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE4)"=="O"
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -651,7 +651,7 @@ $(DEF4TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT4_PROTECT) $(RM) $(SHL4TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE4)"=="O"
 #
@@ -661,7 +661,7 @@ $(DEF4TARGETN) .PHONY : \
     +$(TMP)$/$(DEF4UNIQE:b).bat && $(RM) $(TMP)$/$(DEF4UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE4)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 .IF "$(DEF4EXPORT1)"!=""
     @echo $(DEF4EXPORT1)										>>$@
@@ -770,7 +770,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
 
@@ -787,7 +787,7 @@ EXPORT5_PROTECT=$(TMP)$/$(DEF5UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB5NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP5HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -799,7 +799,7 @@ $(DEF5TARGETN) .PHONY : \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(BUILD_DRIVE5)"=="O"
@@ -810,7 +810,7 @@ $(DEF5TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE5)"=="O"
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -837,7 +837,7 @@ $(DEF5TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT5_PROTECT) $(RM) $(SHL5TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE5)"=="O"
 #
@@ -847,7 +847,7 @@ $(DEF5TARGETN) .PHONY : \
     +$(TMP)$/$(DEF5UNIQE:b).bat && $(RM) $(TMP)$/$(DEF5UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE5)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 .IF "$(DEF5EXPORT1)"!=""
     @echo $(DEF5EXPORT1)										>>$@
@@ -956,7 +956,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
 
@@ -973,7 +973,7 @@ EXPORT6_PROTECT=$(TMP)$/$(DEF6UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB6NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP6HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -985,7 +985,7 @@ $(DEF6TARGETN) .PHONY : \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(BUILD_DRIVE6)"=="O"
@@ -996,7 +996,7 @@ $(DEF6TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE6)"=="O"
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -1023,7 +1023,7 @@ $(DEF6TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT6_PROTECT) $(RM) $(SHL6TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE6)"=="O"
 #
@@ -1033,7 +1033,7 @@ $(DEF6TARGETN) .PHONY : \
     +$(TMP)$/$(DEF6UNIQE:b).bat && $(RM) $(TMP)$/$(DEF6UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE6)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 .IF "$(DEF6EXPORT1)"!=""
     @echo $(DEF6EXPORT1)										>>$@
@@ -1142,7 +1142,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
 
@@ -1159,7 +1159,7 @@ EXPORT7_PROTECT=$(TMP)$/$(DEF7UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB7NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP7HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -1171,7 +1171,7 @@ $(DEF7TARGETN) .PHONY : \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(BUILD_DRIVE7)"=="O"
@@ -1182,7 +1182,7 @@ $(DEF7TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE7)"=="O"
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -1209,7 +1209,7 @@ $(DEF7TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT7_PROTECT) $(RM) $(SHL7TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE7)"=="O"
 #
@@ -1219,7 +1219,7 @@ $(DEF7TARGETN) .PHONY : \
     +$(TMP)$/$(DEF7UNIQE:b).bat && $(RM) $(TMP)$/$(DEF7UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE7)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 .IF "$(DEF7EXPORT1)"!=""
     @echo $(DEF7EXPORT1)										>>$@
@@ -1328,7 +1328,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
 
@@ -1345,7 +1345,7 @@ EXPORT8_PROTECT=$(TMP)$/$(DEF8UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB8NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP8HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -1357,7 +1357,7 @@ $(DEF8TARGETN) .PHONY : \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(BUILD_DRIVE8)"=="O"
@@ -1368,7 +1368,7 @@ $(DEF8TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE8)"=="O"
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -1395,7 +1395,7 @@ $(DEF8TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT8_PROTECT) $(RM) $(SHL8TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE8)"=="O"
 #
@@ -1405,7 +1405,7 @@ $(DEF8TARGETN) .PHONY : \
     +$(TMP)$/$(DEF8UNIQE:b).bat && $(RM) $(TMP)$/$(DEF8UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE8)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 .IF "$(DEF8EXPORT1)"!=""
     @echo $(DEF8EXPORT1)										>>$@
@@ -1514,7 +1514,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
 
@@ -1531,7 +1531,7 @@ EXPORT9_PROTECT=$(TMP)$/$(DEF9UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB9NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP9HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -1543,7 +1543,7 @@ $(DEF9TARGETN) .PHONY : \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(BUILD_DRIVE9)"=="O"
@@ -1554,7 +1554,7 @@ $(DEF9TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE9)"=="O"
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -1581,7 +1581,7 @@ $(DEF9TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT9_PROTECT) $(RM) $(SHL9TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE9)"=="O"
 #
@@ -1591,7 +1591,7 @@ $(DEF9TARGETN) .PHONY : \
     +$(TMP)$/$(DEF9UNIQE:b).bat && $(RM) $(TMP)$/$(DEF9UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE9)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 .IF "$(DEF9EXPORT1)"!=""
     @echo $(DEF9EXPORT1)										>>$@
@@ -1700,7 +1700,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
 
@@ -1717,7 +1717,7 @@ EXPORT10_PROTECT=$(TMP)$/$(DEF10UNIQE:b).bat &&
 
 .ENDIF			# "$(DEFLIB10NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP10HEAP)"==""
 .IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
@@ -1729,7 +1729,7 @@ $(DEF10TARGETN) .PHONY : \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BSCLIENT)"!=""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(BUILD_DRIVE10)"=="O"
@@ -1740,7 +1740,7 @@ $(DEF10TARGETN) .PHONY : \
 .ENDIF			# "$(BUILD_DRIVE10)"=="O"
 .ENDIF				# "$(DEFLIB10NAME)"!=""
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
@@ -1767,7 +1767,7 @@ $(DEF10TARGETN) .PHONY : \
 .ENDIF				# "$(USE_LDUMP2)"=!""
     +$(EXPORT10_PROTECT) $(RM) $(SHL10TARGET).exp
 # now *\defs\$(OUTPATH)	exists, commit it
-.IF "$(BSCLIENT)"==""
+.IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(BUILD_DRIVE10)"=="O"
 #
@@ -1777,7 +1777,7 @@ $(DEF10TARGETN) .PHONY : \
     +$(TMP)$/$(DEF10UNIQE:b).bat && $(RM) $(TMP)$/$(DEF10UNIQE:b).bat
 .ENDIF			# "$(BUILD_DRIVE10)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
-.ENDIF			# "$(BSCLIENT)"==""
+.ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB10NAME)"!=""
 .IF "$(DEF10EXPORT1)"!=""
     @echo $(DEF10EXPORT1)										>>$@