Made the following changes so that the tcsh make recipes will work from a non-terminal shell (e.g. in cron and at):

- Escaped all # characters in sed statements.
- Quoted all # characters in echo statements.
This change was made because tcsh treats unescaped and unquoted # characters in a command as the start of a comment when the shell is not attached to a terminal (see tcsh man page).

10 files changed, 331 insertions, 331 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 83ea779d729e..085b2edcc30c 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -42,7 +42,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP1OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -50,7 +50,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP1OBJS) `cat /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP1STDLIBS) $(APP1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP1OBJS) `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP1STDLIBS) $(APP1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -62,7 +62,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
 .ENDIF
 .IF "$(APP1VERINFO)" != ""
-    @-+echo #include "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
+     @-+echo "#include"  "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
 .ENDIF			# "$(APP1LINKRES)" != ""
@@ -187,7 +187,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP2OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -195,7 +195,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP2OBJS) `cat /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP2STDLIBS) $(APP2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP2OBJS) `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP2STDLIBS) $(APP2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -207,7 +207,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
 .ENDIF
 .IF "$(APP2VERINFO)" != ""
-    @-+echo #include "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
+     @-+echo "#include"  "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
 .ENDIF			# "$(APP2LINKRES)" != ""
@@ -332,7 +332,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP3OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -340,7 +340,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP3OBJS) `cat /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP3STDLIBS) $(APP3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP3OBJS) `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP3STDLIBS) $(APP3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -352,7 +352,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
 .ENDIF
 .IF "$(APP3VERINFO)" != ""
-    @-+echo #include "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
+     @-+echo "#include"  "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
 .ENDIF			# "$(APP3LINKRES)" != ""
@@ -477,7 +477,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP4OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -485,7 +485,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP4OBJS) `cat /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP4STDLIBS) $(APP4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP4OBJS) `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP4STDLIBS) $(APP4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -497,7 +497,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
 .ENDIF
 .IF "$(APP4VERINFO)" != ""
-    @-+echo #include "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
+     @-+echo "#include"  "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
 .ENDIF			# "$(APP4LINKRES)" != ""
@@ -622,7 +622,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP5OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -630,7 +630,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP5OBJS) `cat /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP5STDLIBS) $(APP5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP5OBJS) `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP5STDLIBS) $(APP5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -642,7 +642,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
 .ENDIF
 .IF "$(APP5VERINFO)" != ""
-    @-+echo #include "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
+     @-+echo "#include"  "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
 .ENDIF			# "$(APP5LINKRES)" != ""
@@ -767,7 +767,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP6OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -775,7 +775,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP6OBJS) `cat /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP6STDLIBS) $(APP6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP6OBJS) `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP6STDLIBS) $(APP6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -787,7 +787,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
 .ENDIF
 .IF "$(APP6VERINFO)" != ""
-    @-+echo #include "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
+     @-+echo "#include"  "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
 .ENDIF			# "$(APP6LINKRES)" != ""
@@ -912,7 +912,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP7OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -920,7 +920,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP7OBJS) `cat /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP7STDLIBS) $(APP7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP7OBJS) `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP7STDLIBS) $(APP7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -932,7 +932,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
 .ENDIF
 .IF "$(APP7VERINFO)" != ""
-    @-+echo #include "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
+     @-+echo "#include"  "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
 .ENDIF			# "$(APP7LINKRES)" != ""
@@ -1057,7 +1057,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP8OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -1065,7 +1065,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP8OBJS) `cat /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP8STDLIBS) $(APP8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP8OBJS) `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP8STDLIBS) $(APP8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -1077,7 +1077,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
 .ENDIF
 .IF "$(APP8VERINFO)" != ""
-    @-+echo #include "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
+     @-+echo "#include"  "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
 .ENDIF			# "$(APP8LINKRES)" != ""
@@ -1202,7 +1202,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP9OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -1210,7 +1210,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP9OBJS) `cat /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP9STDLIBS) $(APP9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP9OBJS) `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP9STDLIBS) $(APP9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -1222,7 +1222,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
 .ENDIF
 .IF "$(APP9VERINFO)" != ""
-    @-+echo #include "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
+     @-+echo "#include"  "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
 .ENDIF			# "$(APP9LINKRES)" != ""
@@ -1347,7 +1347,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP10OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -1355,7 +1355,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP10OBJS) `cat /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP10STDLIBS) $(APP10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP10OBJS) `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP10STDLIBS) $(APP10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -1367,7 +1367,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
 .ENDIF
 .IF "$(APP10VERINFO)" != ""
-    @-+echo #include "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
+     @-+echo "#include"  "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
 .ENDIF			# "$(APP10LINKRES)" != ""
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 325c302e89e4..370d6fe57ecc 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -16,19 +16,19 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB1OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB1OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB1FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB1TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB1TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB1ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
 .ENDIF
@@ -38,11 +38,11 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB1OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB1OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB1FILES) | xargs -n 1 >> $@
 .IF "$(LIB1ARCHIV)" != ""
     @+$(RM) $(LIB1ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB1ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB1ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB1ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -91,19 +91,19 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB2OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB2OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB2FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB2TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB2TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB2ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
 .ENDIF
@@ -113,11 +113,11 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB2OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB2OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB2FILES) | xargs -n 1 >> $@
 .IF "$(LIB2ARCHIV)" != ""
     @+$(RM) $(LIB2ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB2ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB2ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB2ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -166,19 +166,19 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB3OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB3OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB3FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB3TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB3TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB3ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
 .ENDIF
@@ -188,11 +188,11 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB3OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB3OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB3FILES) | xargs -n 1 >> $@
 .IF "$(LIB3ARCHIV)" != ""
     @+$(RM) $(LIB3ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB3ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB3ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB3ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -241,19 +241,19 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB4OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB4OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB4FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB4TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB4TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB4ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
 .ENDIF
@@ -263,11 +263,11 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB4OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB4OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB4FILES) | xargs -n 1 >> $@
 .IF "$(LIB4ARCHIV)" != ""
     @+$(RM) $(LIB4ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB4ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB4ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB4ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -316,19 +316,19 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB5OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB5OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB5FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB5TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB5TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB5ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
 .ENDIF
@@ -338,11 +338,11 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB5OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB5OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB5FILES) | xargs -n 1 >> $@
 .IF "$(LIB5ARCHIV)" != ""
     @+$(RM) $(LIB5ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB5ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB5ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB5ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -391,19 +391,19 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB6OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB6OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB6FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB6TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB6TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB6ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
 .ENDIF
@@ -413,11 +413,11 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB6OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB6OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB6FILES) | xargs -n 1 >> $@
 .IF "$(LIB6ARCHIV)" != ""
     @+$(RM) $(LIB6ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB6ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB6ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB6ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -466,19 +466,19 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB7OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB7OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB7FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB7TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB7TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB7ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
 .ENDIF
@@ -488,11 +488,11 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB7OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB7OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB7FILES) | xargs -n 1 >> $@
 .IF "$(LIB7ARCHIV)" != ""
     @+$(RM) $(LIB7ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB7ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB7ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB7ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -541,19 +541,19 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB8OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB8OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB8FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB8TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB8TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB8ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
 .ENDIF
@@ -563,11 +563,11 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB8OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB8OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB8FILES) | xargs -n 1 >> $@
 .IF "$(LIB8ARCHIV)" != ""
     @+$(RM) $(LIB8ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB8ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB8ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB8ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -616,19 +616,19 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB9OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB9OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB9FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB9TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB9TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB9ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
 .ENDIF
@@ -638,11 +638,11 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB9OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB9OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB9FILES) | xargs -n 1 >> $@
 .IF "$(LIB9ARCHIV)" != ""
     @+$(RM) $(LIB9ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB9ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB9ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB9ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
@@ -691,19 +691,19 @@ $(LIB10TARGET) :	$(LIB10FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB10OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB10OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB10FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB10TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB10TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB10ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
 .ENDIF
@@ -713,11 +713,11 @@ $(LIB10TARGET) :	$(LIB10FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB10OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB10OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB10FILES) | xargs -n 1 >> $@
 .IF "$(LIB10ARCHIV)" != ""
     @+$(RM) $(LIB10ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB10ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB10ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB10ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 12db25ca35d7..5f1aa7222f26 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -115,18 +115,18 @@ $(SHL1TARGETN) : \
     @echo Making: $(SHL1TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -180,10 +180,10 @@ $(SHL1TARGETN) : \
     @-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
 .ENDIF			# "$(SHL1DEFAULTRES)"!=""
@@ -220,7 +220,7 @@ $(SHL1TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL1LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL1STDLIBS) $(STDSHL) $(SHL1RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -317,7 +317,7 @@ $(SHL1TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -343,7 +343,7 @@ $(SHL1TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL1OBJS) `cat /dev/null $(SHL1LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL1OBJS) `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL1TARGETN)"!=""
 
@@ -515,18 +515,18 @@ $(SHL2TARGETN) : \
     @echo Making: $(SHL2TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -580,10 +580,10 @@ $(SHL2TARGETN) : \
     @-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
 .ENDIF			# "$(SHL2DEFAULTRES)"!=""
@@ -620,7 +620,7 @@ $(SHL2TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL2LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL2STDLIBS) $(STDSHL) $(SHL2RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -717,7 +717,7 @@ $(SHL2TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -743,7 +743,7 @@ $(SHL2TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL2OBJS) `cat /dev/null $(SHL2LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL2OBJS) `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL2TARGETN)"!=""
 
@@ -915,18 +915,18 @@ $(SHL3TARGETN) : \
     @echo Making: $(SHL3TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -980,10 +980,10 @@ $(SHL3TARGETN) : \
     @-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
 .ENDIF			# "$(SHL3DEFAULTRES)"!=""
@@ -1020,7 +1020,7 @@ $(SHL3TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL3LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL3STDLIBS) $(STDSHL) $(SHL3RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -1117,7 +1117,7 @@ $(SHL3TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -1143,7 +1143,7 @@ $(SHL3TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL3OBJS) `cat /dev/null $(SHL3LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL3OBJS) `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL3TARGETN)"!=""
 
@@ -1315,18 +1315,18 @@ $(SHL4TARGETN) : \
     @echo Making: $(SHL4TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -1380,10 +1380,10 @@ $(SHL4TARGETN) : \
     @-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
 .ENDIF			# "$(SHL4DEFAULTRES)"!=""
@@ -1420,7 +1420,7 @@ $(SHL4TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL4LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL4STDLIBS) $(STDSHL) $(SHL4RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -1517,7 +1517,7 @@ $(SHL4TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -1543,7 +1543,7 @@ $(SHL4TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL4OBJS) `cat /dev/null $(SHL4LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL4OBJS) `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL4TARGETN)"!=""
 
@@ -1715,18 +1715,18 @@ $(SHL5TARGETN) : \
     @echo Making: $(SHL5TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -1780,10 +1780,10 @@ $(SHL5TARGETN) : \
     @-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
 .ENDIF			# "$(SHL5DEFAULTRES)"!=""
@@ -1820,7 +1820,7 @@ $(SHL5TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL5LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL5STDLIBS) $(STDSHL) $(SHL5RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -1917,7 +1917,7 @@ $(SHL5TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -1943,7 +1943,7 @@ $(SHL5TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL5OBJS) `cat /dev/null $(SHL5LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL5OBJS) `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL5TARGETN)"!=""
 
@@ -2115,18 +2115,18 @@ $(SHL6TARGETN) : \
     @echo Making: $(SHL6TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -2180,10 +2180,10 @@ $(SHL6TARGETN) : \
     @-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
 .ENDIF			# "$(SHL6DEFAULTRES)"!=""
@@ -2220,7 +2220,7 @@ $(SHL6TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL6LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL6STDLIBS) $(STDSHL) $(SHL6RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -2317,7 +2317,7 @@ $(SHL6TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -2343,7 +2343,7 @@ $(SHL6TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL6OBJS) `cat /dev/null $(SHL6LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL6OBJS) `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL6TARGETN)"!=""
 
@@ -2515,18 +2515,18 @@ $(SHL7TARGETN) : \
     @echo Making: $(SHL7TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -2580,10 +2580,10 @@ $(SHL7TARGETN) : \
     @-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
 .ENDIF			# "$(SHL7DEFAULTRES)"!=""
@@ -2620,7 +2620,7 @@ $(SHL7TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL7LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL7STDLIBS) $(STDSHL) $(SHL7RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -2717,7 +2717,7 @@ $(SHL7TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -2743,7 +2743,7 @@ $(SHL7TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL7OBJS) `cat /dev/null $(SHL7LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL7OBJS) `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL7TARGETN)"!=""
 
@@ -2915,18 +2915,18 @@ $(SHL8TARGETN) : \
     @echo Making: $(SHL8TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -2980,10 +2980,10 @@ $(SHL8TARGETN) : \
     @-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
 .ENDIF			# "$(SHL8DEFAULTRES)"!=""
@@ -3020,7 +3020,7 @@ $(SHL8TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL8LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL8STDLIBS) $(STDSHL) $(SHL8RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -3117,7 +3117,7 @@ $(SHL8TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -3143,7 +3143,7 @@ $(SHL8TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL8OBJS) `cat /dev/null $(SHL8LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL8OBJS) `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL8TARGETN)"!=""
 
@@ -3315,18 +3315,18 @@ $(SHL9TARGETN) : \
     @echo Making: $(SHL9TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -3380,10 +3380,10 @@ $(SHL9TARGETN) : \
     @-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
 .ENDIF			# "$(SHL9DEFAULTRES)"!=""
@@ -3420,7 +3420,7 @@ $(SHL9TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL9LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL9STDLIBS) $(STDSHL) $(SHL9RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -3517,7 +3517,7 @@ $(SHL9TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -3543,7 +3543,7 @@ $(SHL9TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL9OBJS) `cat /dev/null $(SHL9LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL9OBJS) `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL9TARGETN)"!=""
 
@@ -3715,18 +3715,18 @@ $(SHL10TARGETN) : \
     @echo Making: $(SHL10TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -3780,10 +3780,10 @@ $(SHL10TARGETN) : \
     @-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
 .ENDIF			# "$(SHL10DEFAULTRES)"!=""
@@ -3820,7 +3820,7 @@ $(SHL10TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL10LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL10STDLIBS) $(STDSHL) $(SHL10RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -3917,7 +3917,7 @@ $(SHL10TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -3943,7 +3943,7 @@ $(SHL10TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL10OBJS) `cat /dev/null $(SHL10LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL10OBJS) `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL10TARGETN)"!=""
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 1cb72a525136..ac8dbf96ddc4 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -7,8 +7,8 @@
 ##*                      Regeln
 ##*
 ##*    Ersterstellung    MH 9.2.96
-##*    Letzte Aenderung  $Author: hjs $ $Date: 2000-09-21 13:12:00 $
-##*    $Revision: 1.2 $
+##*    Letzte Aenderung  $Author: pluby $ $Date: 2000-10-06 15:03:01 $
+##*    $Revision: 1.3 $
 ##*
 ##*    $Logfile:   T:/solar/inc/rules.mkv  $
 ##*
@@ -85,8 +85,8 @@ $(SLO)$/%.obj : %.cxx
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
 .IF "$(COM)"=="WTC"
@@ -125,8 +125,8 @@ $(SLO)$/%.obj : %.cpp
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
 .IF "$(COM)"=="WTC"
@@ -165,8 +165,8 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
     @+if exist $@ $(RM) /q $@ >& nul
@@ -203,8 +203,8 @@ $(OBJ)$/$(IDLPACKAGE)$/%.obj : $(OUTCXX)$/$(IDLPACKAGE)$/%.cxx
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
     @+if exist $@ $(RM) /q $@ >& nul
@@ -237,8 +237,8 @@ $(SLO)$(SMARTPRE)$/$(IDLPACKAGE)$/%.obj : $(OUTCXX)$(SMARTPRE)$/$(IDLPACKAGE)$/%
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
     @+if exist $@ $(RM) /q $@ >& nul
@@ -271,8 +271,8 @@ $(OBJ)$/%.obj : $(MISC)$/%.cxx
 .ELSE
 .IF "$(MDB)" != ""
     @echo $@
-    @echo #$*#
-    @echo #$/#
+    @echo "#$*#"
+    @echo "#$/#"
     @echo $(&:+"\n"))
 .ENDIF
     @+if exist $@ $(RM) /q $@ >& nul
@@ -456,7 +456,7 @@ $(MISC)$/%.dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
     dmake $(MFLAGS) $(CALLMACROS) make_srs_deps=true SRCALLTARGET -u
     +-$(TYPE) $(SRS)$/$(PWD:f).*.dpr >> $@
 .ELSE
-    @+echo # > $@
+    @+echo "#" > $@
 .ENDIF
 .ELSE		# MAKEFILERC == ""
 $/.dpc : 
@@ -474,7 +474,7 @@ $(MISC)$/%.dpz :
     $(TYPE) $(MISC)$/$(TARGET).$(PWD:f).*.dpzz >> $@
     @+-$(RM) $(MISC)$/$(TARGET).$(PWD:f).*.dpzz >& $(NULLDEV)
 .ELSE
-    @+echo # > $@
+    @+echo "#" > $@
 .ENDIF
 
 # Dependencies fuer unoidl - Files
@@ -487,7 +487,7 @@ $(MISC)$/%.dp2 : makefile.mk
 .ENDIF   #NOSMARTUNO
 .ELSE
     @+echo not making dp2...
-    @+echo #> $@
+    @+echo "#" > $@
 .ENDIF
 
 $(MISC)$/%.dp1 : makefile.mk
@@ -505,7 +505,7 @@ $(MISC)$/%.dp1 : makefile.mk
 .ENDIF   #NOSMARTUNO
 .ELSE
     @+echo not making dp1...
-    @+echo #> $@
+    @+echo "#" > $@
 .ENDIF
 
 $(MISC)$/%.dp3 : makefile.mk
@@ -514,7 +514,7 @@ $(MISC)$/%.dp3 : makefile.mk
     +$(UNOIDL) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) $(UNOIDLDEPFLAGS) -Bjava -P$(PRJNAME) -OH$(MISC)$/java $(DEPIDLFILES)) > $(MISC)$/$(TARGET).dp3
 .ELSE
     @+echo not making dp3...
-    @+echo #> $@
+    @+echo "#" > $@
 .ENDIF
 
 $(MISC)$/%.dpj : makefile.mk
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d47dab7b1b89..272e9d96ad5a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -7,8 +7,8 @@
 #*                      Entwicklungtools-Definitionen
 #*
 #*    Ersterstellung    TH 28.03.94
-#*    Letzte Aenderung  $Author: patrick.luby $ $Date: 2000-09-28 13:58:42 $
-#*    $Revision: 1.4 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2000-10-06 15:03:01 $
+#*    $Revision: 1.5 $
 #*
 #*    $Logfile:   T:/solar/inc/settings.mkv  $
 #*
@@ -49,11 +49,11 @@ SOLARVERSION=$(SOLARVER)$/$(UPD)
     @+-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc >& $(NULLDEV)
     @+$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(UPD)minor.mk >& $(NULLDEV)
 .ELSE			# "$(SOURCEVERSION)"=="$(WORK_STAMP)"
-    @+echo #
-    @+echo #
-    @+echo # ERROR: minor.mk in solenv\inc does not match your version!
-    @+echo #
-    @+echo #
+    @+echo "#"
+    @+echo "#"
+    @+echo "#" ERROR: minor.mk in solenv\inc does not match your version!
+    @+echo "#"
+    @+echo "#"
     force_dmake_to_error
 .ENDIF			# "$(SOURCEVERSION)"=="$(WORK_STAMP)"
 .IF "$(GUI)"=="UNX"
@@ -579,10 +579,10 @@ common_build_sign_jar=true
 
 %world.mk :
     @+_mkout $(OUT)
-    @+echo # > $(OUT)$/inc$/myworld.mk
+    @+echo "#" > $(OUT)$/inc$/myworld.mk
 .IF "$(common_build)"!=""
     @+_mkout $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
-    @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
+    @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
 .ENDIF			# "$(common_build)"!=""
 
 .INCLUDE .IGNORE : $(OUT)$/inc$/myworld.mk
@@ -595,10 +595,10 @@ common_build_sign_jar=true
 
 %worldremote.mk :
     @+_mkout -r
-    @+echo # > $(OUT)$/inc$/myworldremote.mk
+    @+echo "#" > $(OUT)$/inc$/myworldremote.mk
 .IF "$(common_build)"!=""
     @+_mkout -r $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
-    @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
+    @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
 .ENDIF			# "$(common_build)"!=""
 
 .INCLUDE .IGNORE : $(OUT)$/inc$/myworldremote.mk
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 22387fe90dc4..f284f8ad5ef6 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -5,8 +5,8 @@
 #*	  Beschreibung		TARGET-Rules
 #*
 #*	  Ersterstellung	TH 28.03.94
-#*	  Letzte Aenderung	$Author: hjs $ $Date: 2000-10-06 11:15:49 $
-#*	  $Revision: 1.6 $
+#*	  Letzte Aenderung	$Author: pluby $ $Date: 2000-10-06 15:03:01 $
+#*	  $Revision: 1.7 $
 #*
 #*	  $Logfile:   T:/solar/inc/target.mkv  $
 #*
@@ -1960,7 +1960,7 @@ $(SUBDIRS) : $(SUBDIRSDEPS)
 #mhtest:
 #	@echo MYUNOIDLTARGETS : $(MYUNOIDLTARGETS) $(SLOFILES)
 #	@echo MHMISC_ : $(UNOIDLTARGETS) $(IDLPACKAGE) xxxx $(_PACKAGE)
-#	@+-echo #define SUPD "$(UPD)" >> ttt.mk
+#	@+-echo "#define" SUPD "$(UPD)" >> ttt.mk
 
 .INCLUDE : tg_dir.mk
 
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 92c631be16f1..736eee3f8deb 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -3,8 +3,8 @@
 #*    $Workfile:   tg_app.mk  $
 #*
 #*    Ersterstellung    XX  TT.MM.JJ
-#*    Letzte Aenderung  $Author: hr $ $Date: 2000-09-20 14:43:17 $
-#*    $Revision: 1.1.1.1 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2000-10-06 15:03:01 $
+#*    $Revision: 1.2 $
 #*
 #*    $Logfile:   T:/solar/inc/tg_app.mkv  $
 #*
@@ -88,7 +88,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP$(TNR)OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \
+    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
     $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
@@ -96,7 +96,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 .ENDIF
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM $@.idb
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP$(TNR)OBJS) `cat /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(APP$(TNR)STDLIBS) $(APP$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(APP$(TNR)OBJS) `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(APP$(TNR)STDLIBS) $(APP$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF                  # "$(GUI)"=="MAC"
 
 .IF "$(GUI)" == "WNT"
@@ -108,7 +108,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
 .ENDIF
 .IF "$(APP$(TNR)VERINFO)" != ""
-    @-+echo #include "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+     @-+echo "#include"  "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
 .ENDIF
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
 .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 2adec3fccdc6..fa588bde5d61 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -66,23 +66,23 @@ ALLDPC: \
 .IF "$(debug)"==""
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(TARGET).dpw
-    @$(TYPE)  $(MISC)$/$(TARGET).dpc | $(SED) s#$/slo$/#$/dso$/# | $(SED) s#$/obj$/#$/dbo$/# > $(MISC)$/$(TARGET).dpw
+    @$(TYPE)  $(MISC)$/$(TARGET).dpc | $(SED) s#$/slo$/#$/dso$/# | $(SED) s\#$/obj$/\#$/dbo$/\# > $(MISC)$/$(TARGET).dpw
 .ELSE
     @+-$(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV)
-    @$(TYPE)  $(MISC)$/$(TARGET).dpc | $(SED) s#$/$/slo$/$/#$/$/dso$/$/# > $(TEMP)$/$(TARGET).dpt
-    @$(TYPE) $(TEMP)$/$(TARGET).dpt | $(SED) s#$/$/obj$/$/#$/$/dbo$/$/# > $(MISC)$/$(TARGET).dpw
+    @$(TYPE)  $(MISC)$/$(TARGET).dpc | $(SED) s\#$/$/slo$/$/\#$/$/dso$/$/\# > $(TEMP)$/$(TARGET).dpt
+    @$(TYPE) $(TEMP)$/$(TARGET).dpt | $(SED) s\#$/$/obj$/$/\#$/$/dbo$/$/\# > $(MISC)$/$(TARGET).dpw
     @+-$(RM) $(TEMP)$/$(TARGET).dpt >& $(NULLDEV)
 .ENDIF
 .ELSE			# "$(debug)"==""
 .IF "$(GUI)"=="UNX"
     @+$(COPY) $(MISC)$/$(TARGET).dpc $(MISC)$/$(TARGET).dpw
     @+-$(RM) $(MISC)$/$(TARGET).dpc
-    @$(TYPE)  $(MISC)$/$(TARGET).dpw | $(SED) s#$/dso$/#$/slo$/# | $(SED) s#$/dbo$/#$/obj$/# > $(MISC)$/$(TARGET).dpc
+    @$(TYPE)  $(MISC)$/$(TARGET).dpw | $(SED) s#$/dso$/#$/slo$/# | $(SED) s\#$/dbo$/\#$/obj$/\# > $(MISC)$/$(TARGET).dpc
 .ELSE
     @+$(COPY) $(MISC)$/$(TARGET).dpc $(MISC)$/$(TARGET).dpw >& $(NULLDEV)
     @+-$(RM) $(MISC)$/$(TARGET).dpc >& $(NULLDEV)
-    @$(TYPE) $(MISC)$/$(TARGET).dpw | $(SED) s#$/$/dso$/$/#$/$/slo$/$/# > $(TEMP)$/$(TARGET).dpt
-    @$(TYPE) $(TEMP)$/$(TARGET).dpt | $(SED) s#$/$/dbo$/$/#$/$/obj$/$/# > $(MISC)$/$(TARGET).dpc
+    @$(TYPE) $(MISC)$/$(TARGET).dpw | $(SED) s\#$/$/dso$/$/\#$/$/slo$/$/\# > $(TEMP)$/$(TARGET).dpt
+    @$(TYPE) $(TEMP)$/$(TARGET).dpt | $(SED) s\#$/$/dbo$/$/\#$/$/obj$/$/\# > $(MISC)$/$(TARGET).dpc
     @+-$(RM) $(TEMP)$/$(TARGET).dpt >& $(NULLDEV)
 .ENDIF
 .ENDIF			# "$(debug)"==""
@@ -96,9 +96,9 @@ ALLDPC: \
 ALLDPC:
     @echo ------------------------------
     @echo No Dependencies
-    @echo # > $(MISC)$/$(TARGET).dpc
+    @echo "#" > $(MISC)$/$(TARGET).dpc
 .IF "$(GROUP)"=="WRITER"
-    @echo # > $(MISC)$/$(TARGET).dpw
+    @echo "#" > $(MISC)$/$(TARGET).dpw
 .ENDIF
 
 ALLDEP:
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index d85644d29e2b..bcba37453b5e 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -50,19 +50,19 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
 .ENDIF
 .IF "$(GUI)"=="UNX"
     @+$(RM) $@
-    @+echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@
     @+$(RM) $(@:d)$(@:b).dump
-    @+nm `cat $(LIB$(TNR)TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(@:d)$(@:b).dump
+    @+nm `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump
 .IF "$(LIB$(TNR)ARCHIV)" != ""
     @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
     @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-    @+echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
+    @+echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
     @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
     @source $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
 .ENDIF
-    @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
+    @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)$(COM)"=="NETBSDGCC"
     @+echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
 .ENDIF
@@ -72,11 +72,11 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
 .ELSE			# "$(GUI)"=="UNX"
 .IF "$(GUI)"=="MAC"
     @+$(RM) $@
-    @+echo $(LIB$(TNR)OBJFILES) | sed s#$(PRJ)$/$(ROUT)#$(ROUT)#g | xargs -n 1 > $@
+    @+echo $(LIB$(TNR)OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@
     @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n 1 >> $@
 .IF "$(LIB$(TNR)ARCHIV)" != ""
     @+$(RM) $(LIB$(TNR)ARCHIV)
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB$(TNR)ARCHIV) `cat /dev/null $@ | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g`)
+    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB$(TNR)ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
 .ENDIF			# "$(LIB$(TNR)ARCHIV)" != ""
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(COM)" == "BLC"
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 5336a637d3e0..fd7e67b70ed4 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -3,8 +3,8 @@
 #*    $Workfile:   tg_shl.mk  $
 #*
 #*    Ersterstellung    MH 01.09.97
-#*    Letzte Aenderung  $Author: hr $ $Date: 2000-09-20 14:43:17 $
-#*    $Revision: 1.1.1.1 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2000-10-06 15:03:01 $
+#*    $Revision: 1.2 $
 #*
 #*    $Logfile:   T:/solar/inc/tg_shl.mkv  $
 #*
@@ -167,18 +167,18 @@ $(SHL$(TNR)TARGETN) : \
     @echo Making: $(SHL$(TNR)TARGETN)
 .IF "$(UPDATER)"=="YES"
 .IF "$(GUI)"=="UNX"
-        @+echo #define _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD \"$(BUILD)\"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD \"$(UPD)\"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $(INCCOM)$/_version.h
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
-        @+echo #define _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH \"$(INPATH)\"	>> $(INCCOM)$/_version.h
 .ELSE
-        @+echo #define _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
-        @+echo #define _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
-        @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
-        @+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
-        @+echo #define _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
+        @+echo "#define" _BUILD "$(BUILD)"	> $(INCCOM)$/_version.h
+        @+echo "#define" _UPD "$(UPD)"		>> $(INCCOM)$/_version.h
+        @+echo "#define" _LAST_MINOR '$(LAST_MINOR)'	>> $(INCCOM)$/_version.h
+        @+echo "#define" _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
+        @+echo "#define" _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
+        @+echo "#define" _INPATH "$(INPATH)"	>> $(INCCOM)$/_version.h
 .ENDIF
         @-+$(RM) $(SLO)$/_version.obj 
 .ENDIF
@@ -232,10 +232,10 @@ $(SHL$(TNR)TARGETN) : \
     @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF
 .IF "$(use_shl_versions)" != ""
-    @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @-+echo #define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-    @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo "#define" VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo "#define" ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+    @-+echo "#define" INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+     @-+echo "#include"  "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(use_shl_versions)" != ""
     $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
@@ -272,7 +272,7 @@ $(SHL$(TNR)TARGETN) : \
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(VERSIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
-    @+$(TYPE) $(SHL$(TNR)LIBS) | sed s#$(ROUT)#$(PRJ)$/$/$(ROUT)#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
+    @+$(TYPE) $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d �\r\n� >> $(MISC)$/$(@:b).cmd
     @+echo  $(SHL$(TNR)STDLIBS) $(STDSHL) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd
     $(MISC)$/$(@:b).cmd
 .ELSE
@@ -369,7 +369,7 @@ $(SHL$(TNR)TARGETN) : \
     @+-$(RM) $(MISC)$/$(@:b).cmd
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
     $(VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` \
+    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
     $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
@@ -395,7 +395,7 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
-    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL$(TNR)OBJS) `cat /dev/null $(SHL$(TNR)LIBS) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` $(VERSIONOBJ)) $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
+    $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL$(TNR)OBJS) `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ)) $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
 .ENDIF			# "$(GUI)"=="MAC"
 .ENDIF			# "$(SHL$(TNR)TARGETN)"!=""