CWS-TOOLING: integrate CWS kick4nt

1 files changed, 210 insertions, 210 deletions

diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 06d4174200ba..cae6cd48a6b1 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -8,19 +8,19 @@ DEFLIB1NAME*=$(DEF1LIBNAME)
 .ENDIF			# "$(DEF1LIBNAME)"!=""
 
 .IF "$(DEFLIB1NAME)"!=""
-DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
+DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL1VERSIONMAP)"!=""
 .IF "$(DEF1EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
+DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -28,7 +28,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL1OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -37,9 +37,9 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
+DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
 $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF1EXPORTFILE)"==""
@@ -47,7 +47,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF1FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK1:=$(RM)
 
@@ -76,20 +76,20 @@ $(DEF1TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL1TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL1TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL1TARGET).exp
+    @-$(RM) $(MISC)/$(SHL1TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL1TARGET).exp
 .ELSE
 .IF "$(SHL1USE_EXPORTS)"==""
-    @-$(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
-    $(RMHACK1) $(MISC)$/$(SHL1TARGET).exp
+    @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp			   >>$@.tmpfile
+    $(RMHACK1) $(MISC)/$(SHL1TARGET).exp
 .ELSE			# "$(SHL1USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL1TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)$/$(SHL1TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB1NAME)"!=""
@@ -170,8 +170,8 @@ $(DEF1TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL1TARGET8=$(shell @fix_shl $(SHL1TARGETN:f))
 
-DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
+DEF1FILTER=$(SOLARENV)/inc/dummy.flt
+DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF1TARGETN) : \
@@ -193,7 +193,7 @@ $(DEF1TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB1NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB1NAME).lib
+    @+echo $(SLB)/$(DEFLIB1NAME).lib
     @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 
@@ -291,19 +291,19 @@ DEFLIB2NAME*=$(DEF2LIBNAME)
 .ENDIF			# "$(DEF2LIBNAME)"!=""
 
 .IF "$(DEFLIB2NAME)"!=""
-DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
+DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL2VERSIONMAP)"!=""
 .IF "$(DEF2EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
+DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -311,7 +311,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL2OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -320,9 +320,9 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
+DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
 $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF2EXPORTFILE)"==""
@@ -330,7 +330,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF2FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK2:=$(RM)
 
@@ -359,20 +359,20 @@ $(DEF2TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL2TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL2TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL2TARGET).exp
+    @-$(RM) $(MISC)/$(SHL2TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL2TARGET).exp
 .ELSE
 .IF "$(SHL2USE_EXPORTS)"==""
-    @-$(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
-    $(RMHACK2) $(MISC)$/$(SHL2TARGET).exp
+    @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp			   >>$@.tmpfile
+    $(RMHACK2) $(MISC)/$(SHL2TARGET).exp
 .ELSE			# "$(SHL2USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL2TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)$/$(SHL2TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB2NAME)"!=""
@@ -453,8 +453,8 @@ $(DEF2TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL2TARGET8=$(shell @fix_shl $(SHL2TARGETN:f))
 
-DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
+DEF2FILTER=$(SOLARENV)/inc/dummy.flt
+DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF2TARGETN) : \
@@ -476,7 +476,7 @@ $(DEF2TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB2NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB2NAME).lib
+    @+echo $(SLB)/$(DEFLIB2NAME).lib
     @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 
@@ -574,19 +574,19 @@ DEFLIB3NAME*=$(DEF3LIBNAME)
 .ENDIF			# "$(DEF3LIBNAME)"!=""
 
 .IF "$(DEFLIB3NAME)"!=""
-DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
+DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL3VERSIONMAP)"!=""
 .IF "$(DEF3EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
+DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -594,7 +594,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL3OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -603,9 +603,9 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
+DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
 $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF3EXPORTFILE)"==""
@@ -613,7 +613,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF3FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK3:=$(RM)
 
@@ -642,20 +642,20 @@ $(DEF3TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL3TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL3TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL3TARGET).exp
+    @-$(RM) $(MISC)/$(SHL3TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL3TARGET).exp
 .ELSE
 .IF "$(SHL3USE_EXPORTS)"==""
-    @-$(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
-    $(RMHACK3) $(MISC)$/$(SHL3TARGET).exp
+    @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp			   >>$@.tmpfile
+    $(RMHACK3) $(MISC)/$(SHL3TARGET).exp
 .ELSE			# "$(SHL3USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL3TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)$/$(SHL3TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB3NAME)"!=""
@@ -736,8 +736,8 @@ $(DEF3TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL3TARGET8=$(shell @fix_shl $(SHL3TARGETN:f))
 
-DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
+DEF3FILTER=$(SOLARENV)/inc/dummy.flt
+DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF3TARGETN) : \
@@ -759,7 +759,7 @@ $(DEF3TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB3NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB3NAME).lib
+    @+echo $(SLB)/$(DEFLIB3NAME).lib
     @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 
@@ -857,19 +857,19 @@ DEFLIB4NAME*=$(DEF4LIBNAME)
 .ENDIF			# "$(DEF4LIBNAME)"!=""
 
 .IF "$(DEFLIB4NAME)"!=""
-DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
+DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL4VERSIONMAP)"!=""
 .IF "$(DEF4EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
+DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -877,7 +877,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL4OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -886,9 +886,9 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
+DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
 $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF4EXPORTFILE)"==""
@@ -896,7 +896,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF4FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK4:=$(RM)
 
@@ -925,20 +925,20 @@ $(DEF4TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL4TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL4TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL4TARGET).exp
+    @-$(RM) $(MISC)/$(SHL4TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL4TARGET).exp
 .ELSE
 .IF "$(SHL4USE_EXPORTS)"==""
-    @-$(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
-    $(RMHACK4) $(MISC)$/$(SHL4TARGET).exp
+    @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp			   >>$@.tmpfile
+    $(RMHACK4) $(MISC)/$(SHL4TARGET).exp
 .ELSE			# "$(SHL4USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL4TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)$/$(SHL4TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB4NAME)"!=""
@@ -1019,8 +1019,8 @@ $(DEF4TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL4TARGET8=$(shell @fix_shl $(SHL4TARGETN:f))
 
-DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
+DEF4FILTER=$(SOLARENV)/inc/dummy.flt
+DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF4TARGETN) : \
@@ -1042,7 +1042,7 @@ $(DEF4TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB4NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB4NAME).lib
+    @+echo $(SLB)/$(DEFLIB4NAME).lib
     @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 
@@ -1140,19 +1140,19 @@ DEFLIB5NAME*=$(DEF5LIBNAME)
 .ENDIF			# "$(DEF5LIBNAME)"!=""
 
 .IF "$(DEFLIB5NAME)"!=""
-DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
+DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL5VERSIONMAP)"!=""
 .IF "$(DEF5EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
+DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1160,7 +1160,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL5OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1169,9 +1169,9 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
+DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
 $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF5EXPORTFILE)"==""
@@ -1179,7 +1179,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF5FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK5:=$(RM)
 
@@ -1208,20 +1208,20 @@ $(DEF5TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL5TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL5TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL5TARGET).exp
+    @-$(RM) $(MISC)/$(SHL5TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL5TARGET).exp
 .ELSE
 .IF "$(SHL5USE_EXPORTS)"==""
-    @-$(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
-    $(RMHACK5) $(MISC)$/$(SHL5TARGET).exp
+    @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp			   >>$@.tmpfile
+    $(RMHACK5) $(MISC)/$(SHL5TARGET).exp
 .ELSE			# "$(SHL5USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL5TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)$/$(SHL5TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB5NAME)"!=""
@@ -1302,8 +1302,8 @@ $(DEF5TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL5TARGET8=$(shell @fix_shl $(SHL5TARGETN:f))
 
-DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
+DEF5FILTER=$(SOLARENV)/inc/dummy.flt
+DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF5TARGETN) : \
@@ -1325,7 +1325,7 @@ $(DEF5TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB5NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB5NAME).lib
+    @+echo $(SLB)/$(DEFLIB5NAME).lib
     @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 
@@ -1423,19 +1423,19 @@ DEFLIB6NAME*=$(DEF6LIBNAME)
 .ENDIF			# "$(DEF6LIBNAME)"!=""
 
 .IF "$(DEFLIB6NAME)"!=""
-DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
+DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL6VERSIONMAP)"!=""
 .IF "$(DEF6EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
+DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1443,7 +1443,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL6OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1452,9 +1452,9 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
+DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
 $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF6EXPORTFILE)"==""
@@ -1462,7 +1462,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF6FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK6:=$(RM)
 
@@ -1491,20 +1491,20 @@ $(DEF6TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL6TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL6TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL6TARGET).exp
+    @-$(RM) $(MISC)/$(SHL6TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL6TARGET).exp
 .ELSE
 .IF "$(SHL6USE_EXPORTS)"==""
-    @-$(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
-    $(RMHACK6) $(MISC)$/$(SHL6TARGET).exp
+    @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp			   >>$@.tmpfile
+    $(RMHACK6) $(MISC)/$(SHL6TARGET).exp
 .ELSE			# "$(SHL6USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL6TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)$/$(SHL6TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB6NAME)"!=""
@@ -1585,8 +1585,8 @@ $(DEF6TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL6TARGET8=$(shell @fix_shl $(SHL6TARGETN:f))
 
-DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
+DEF6FILTER=$(SOLARENV)/inc/dummy.flt
+DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF6TARGETN) : \
@@ -1608,7 +1608,7 @@ $(DEF6TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB6NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB6NAME).lib
+    @+echo $(SLB)/$(DEFLIB6NAME).lib
     @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 
@@ -1706,19 +1706,19 @@ DEFLIB7NAME*=$(DEF7LIBNAME)
 .ENDIF			# "$(DEF7LIBNAME)"!=""
 
 .IF "$(DEFLIB7NAME)"!=""
-DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
+DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL7VERSIONMAP)"!=""
 .IF "$(DEF7EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
+DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -1726,7 +1726,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL7OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -1735,9 +1735,9 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
+DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
 $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF7EXPORTFILE)"==""
@@ -1745,7 +1745,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF7FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK7:=$(RM)
 
@@ -1774,20 +1774,20 @@ $(DEF7TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL7TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL7TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL7TARGET).exp
+    @-$(RM) $(MISC)/$(SHL7TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL7TARGET).exp
 .ELSE
 .IF "$(SHL7USE_EXPORTS)"==""
-    @-$(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
-    $(RMHACK7) $(MISC)$/$(SHL7TARGET).exp
+    @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp			   >>$@.tmpfile
+    $(RMHACK7) $(MISC)/$(SHL7TARGET).exp
 .ELSE			# "$(SHL7USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL7TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)$/$(SHL7TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB7NAME)"!=""
@@ -1868,8 +1868,8 @@ $(DEF7TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL7TARGET8=$(shell @fix_shl $(SHL7TARGETN:f))
 
-DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
+DEF7FILTER=$(SOLARENV)/inc/dummy.flt
+DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF7TARGETN) : \
@@ -1891,7 +1891,7 @@ $(DEF7TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB7NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB7NAME).lib
+    @+echo $(SLB)/$(DEFLIB7NAME).lib
     @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 
@@ -1989,19 +1989,19 @@ DEFLIB8NAME*=$(DEF8LIBNAME)
 .ENDIF			# "$(DEF8LIBNAME)"!=""
 
 .IF "$(DEFLIB8NAME)"!=""
-DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
+DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL8VERSIONMAP)"!=""
 .IF "$(DEF8EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
+DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2009,7 +2009,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL8OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2018,9 +2018,9 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
+DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
 $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF8EXPORTFILE)"==""
@@ -2028,7 +2028,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF8FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK8:=$(RM)
 
@@ -2057,20 +2057,20 @@ $(DEF8TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL8TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL8TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL8TARGET).exp
+    @-$(RM) $(MISC)/$(SHL8TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL8TARGET).exp
 .ELSE
 .IF "$(SHL8USE_EXPORTS)"==""
-    @-$(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
-    $(RMHACK8) $(MISC)$/$(SHL8TARGET).exp
+    @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp			   >>$@.tmpfile
+    $(RMHACK8) $(MISC)/$(SHL8TARGET).exp
 .ELSE			# "$(SHL8USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL8TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)$/$(SHL8TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB8NAME)"!=""
@@ -2151,8 +2151,8 @@ $(DEF8TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL8TARGET8=$(shell @fix_shl $(SHL8TARGETN:f))
 
-DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
+DEF8FILTER=$(SOLARENV)/inc/dummy.flt
+DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF8TARGETN) : \
@@ -2174,7 +2174,7 @@ $(DEF8TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB8NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB8NAME).lib
+    @+echo $(SLB)/$(DEFLIB8NAME).lib
     @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 
@@ -2272,19 +2272,19 @@ DEFLIB9NAME*=$(DEF9LIBNAME)
 .ENDIF			# "$(DEF9LIBNAME)"!=""
 
 .IF "$(DEFLIB9NAME)"!=""
-DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
+DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL9VERSIONMAP)"!=""
 .IF "$(DEF9EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
+DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2292,7 +2292,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL9OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2301,9 +2301,9 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
+DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
 $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF9EXPORTFILE)"==""
@@ -2311,7 +2311,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF9FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK9:=$(RM)
 
@@ -2340,20 +2340,20 @@ $(DEF9TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL9TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL9TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL9TARGET).exp
+    @-$(RM) $(MISC)/$(SHL9TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL9TARGET).exp
 .ELSE
 .IF "$(SHL9USE_EXPORTS)"==""
-    @-$(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
-    $(RMHACK9) $(MISC)$/$(SHL9TARGET).exp
+    @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp			   >>$@.tmpfile
+    $(RMHACK9) $(MISC)/$(SHL9TARGET).exp
 .ELSE			# "$(SHL9USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL9TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)$/$(SHL9TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB9NAME)"!=""
@@ -2434,8 +2434,8 @@ $(DEF9TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL9TARGET8=$(shell @fix_shl $(SHL9TARGETN:f))
 
-DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
+DEF9FILTER=$(SOLARENV)/inc/dummy.flt
+DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF9TARGETN) : \
@@ -2457,7 +2457,7 @@ $(DEF9TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB9NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB9NAME).lib
+    @+echo $(SLB)/$(DEFLIB9NAME).lib
     @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 
@@ -2555,19 +2555,19 @@ DEFLIB10NAME*=$(DEF10LIBNAME)
 .ENDIF			# "$(DEF10LIBNAME)"!=""
 
 .IF "$(DEFLIB10NAME)"!=""
-DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
+DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
 .ENDIF
 
 .IF "$(SHL10VERSIONMAP)"!=""
 .IF "$(DEF10EXPORTFILE)"==""
 .IF "$(GUI)"=="WNT"
-DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
+DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
 .IF "$(COM)"=="GCC"
 $(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS)
 .ENDIF # .IF "$(COM)"=="GCC"
 
 $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .IF "$(COM)"=="GCC"
     -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
     -$(GREP) "\*\|?" $@ > $@.symbols-regexp
@@ -2575,7 +2575,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 # Extract RTTI symbols from all the objects that will be used to build a shared library
     nm -gP $(SHL10OBJS) \
         `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
+        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
 # overwrite the map file generate into the local output tree with the generated
 # exported symbols list
     $(RENAME) $@.exported-symbols $@
@@ -2584,9 +2584,9 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"
-DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
+DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
 $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@
+    $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
 .ENDIF			# "$(GUI)"=="OS2"
 
 .ENDIF			# "$(DEF10EXPORTFILE)"==""
@@ -2594,7 +2594,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
+DEF10FILTER=$(SOLARENV)/inc/dummy.flt
 
 RMHACK10:=$(RM)
 
@@ -2623,20 +2623,20 @@ $(DEF10TARGETN) .PHONY :
 .ENDIF
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)$/$(SHL10TARGET).exp
-    dlltool --output-def $(MISC)$/$(SHL10TARGET).exp --export-all-symbols \
-         `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`
-    tail --lines +3 $(MISC)$/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)$/$(SHL10TARGET).exp
+    @-$(RM) $(MISC)/$(SHL10TARGET).exp
+    dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
+         `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
+    tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
+    @-$(RM) $(MISC)/$(SHL10TARGET).exp
 .ELSE
 .IF "$(SHL10USE_EXPORTS)"==""
-    @-$(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
-    $(RMHACK10) $(MISC)$/$(SHL10TARGET).exp
+    @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
+    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
+    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp			   >>$@.tmpfile
+    $(RMHACK10) $(MISC)/$(SHL10TARGET).exp
 .ELSE			# "$(SHL10USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL10TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)$/$(SHL10TARGET).direct >>$@.tmpfile
+    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
+    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB10NAME)"!=""
@@ -2717,8 +2717,8 @@ $(DEF10TARGETN) .PHONY :
 #check osl/os2/module.c/osl_loadModule()
 SHL10TARGET8=$(shell @fix_shl $(SHL10TARGETN:f))
 
-DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
-DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
+DEF10FILTER=$(SOLARENV)/inc/dummy.flt
+DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
 
 .IF "$(link_always)"==""
 $(DEF10TARGETN) : \
@@ -2740,7 +2740,7 @@ $(DEF10TARGETN) .PHONY :
 .ENDIF
 
 .IF "$(DEFLIB10NAME)"!=""
-    @+echo $(SLB)$/$(DEFLIB10NAME).lib
+    @+echo $(SLB)/$(DEFLIB10NAME).lib
     @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord
 .ENDIF				# "$(DEFLIB10NAME)"!=""