1 --- oo_1.0_src/sd/source/ui/app/makefile.mk.suxx Fri Jun 14 11:29:42 2002
2 +++ oo_1.0_src/sd/source/ui/app/makefile.mk Fri Jun 14 11:33:27 2002
4 $(INCCOM)$/sddll0.hxx: makefile.mk
7 - echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX)" >$@
8 + echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX)\" >$@
11 echo "$(HASHMARK)define DLL_NAME ¶"sd$(UPD)$(DLLPOSTFIX).dll¶"" > $@
14 - echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
15 + echo "#define DLL_NAME "\"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
17 - echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@
18 + echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX).DLL\" >$@
22 --- oo_1.0_src/sch/source/ui/app/makefile.mk.suxx Fri Jun 14 11:29:53 2002
23 +++ oo_1.0_src/sch/source/ui/app/makefile.mk Fri Jun 14 11:34:03 2002
26 $(INCCOM)$/schlib.hxx: makefile.mk
28 - echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)" >$@
29 + echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)\" >$@
32 echo "$(HASHMARK)define DLL_NAME ¶"sch$(UPD)$(DLLPOSTFIX).dll¶"" > $@
36 - echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
37 + echo "#define DLL_NAME "\"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
39 - echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
40 + echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
44 --- oo_1.0_src/sal/util/makefile.mk.suxx Fri Jun 14 11:30:06 2002
45 +++ oo_1.0_src/sal/util/makefile.mk Fri Jun 14 11:35:42 2002
49 $(OUT)$/inc$/udkversion.h:
50 - echo #ifndef _SAL_UDKVERSION_H_ > $@
51 - echo #define _SAL_UDKVERSION_H_ >> $@
53 - echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
54 - echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
55 - echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
58 + echo "#ifndef _SAL_UDKVERSION_H_" > $@
59 + echo "#define _SAL_UDKVERSION_H_" >> $@
61 + echo "#define SAL_UDK_MAJOR $(UDK_MAJOR)" >> $@
62 + echo "#define SAL_UDK_MINOR $(UDK_MINOR)" >> $@
63 + echo "#define SAL_UDK_MICRO $(UDK_MICRO)" >> $@
69 --- oo_1.0_src/sc/source/ui/app/makefile.mk.suxx Fri Jun 14 11:30:24 2002
70 +++ oo_1.0_src/sc/source/ui/app/makefile.mk Fri Jun 14 11:36:11 2002
73 $(INCCOM)$/scdll0.hxx: makefile.mk
75 - echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)" >$@
76 + echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)\" >$@
79 echo "$(HASHMARK)define DLL_NAME ¶"sc$(UPD)$(DLLPOSTFIX).dll¶"" > $@
82 - echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
83 + echo "#define DLL_NAME "\"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
85 - echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
86 + echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
90 --- oo_1.0_src/basctl/source/basicide/makefile.mk.suxx Fri Jun 14 05:11:03 2002
91 +++ oo_1.0_src/basctl/source/basicide/makefile.mk Fri Jun 14 05:12:32 2002
96 - echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
97 + echo "#define DLL_NAME "\"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
99 echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
101 --- oo_1.0_src/sw/source/ui/app/makefile.mk.suxx Fri Jun 14 11:30:36 2002
102 +++ oo_1.0_src/sw/source/ui/app/makefile.mk Fri Jun 14 11:36:31 2002
103 @@ -152,12 +152,12 @@
105 .IF "$(GUIBASE)"=="WIN"
106 $(INCCOM)$/swdll0.hxx: makefile.mk
107 - echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@
108 + echo "#define DLL_NAME "\"sw$(UPD)$(DLLPOSTFIX).DLL\" >$@
112 $(INCCOM)$/swdll0.hxx: makefile.mk
113 - echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
114 + echo "#define DLL_NAME "\"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
118 --- oo_1.0_src/starmath/source/makefile.mk.suxx Fri Jun 14 11:30:45 2002
119 +++ oo_1.0_src/starmath/source/makefile.mk Fri Jun 14 11:36:46 2002
121 $(INCCOM)$/dllname.hxx: makefile.mk
124 - echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
125 + echo "#define DLL_NAME "\"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
127 - echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
128 + echo "#define DLL_NAME "\"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
131 $(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
132 --- oo_1.0_src/solenv/inc/_tg_app.mk.suxx Fri Jun 14 11:30:57 2002
133 +++ oo_1.0_src/solenv/inc/_tg_app.mk Fri Jun 14 11:39:21 2002
135 @-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
137 .IF "$(APP1VERINFO)" != ""
138 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
139 - @-+echo #include "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
140 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP1LINKRES:b).rc
141 + @-+echo "#include "\"$(APP1VERINFO)\" >> $(MISC)$/$(APP1LINKRES:b).rc
143 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
144 .ENDIF # "$(APP1LINKRES)" != ""
146 @-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
148 .IF "$(APP2VERINFO)" != ""
149 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
150 - @-+echo #include "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
151 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP2LINKRES:b).rc
152 + @-+echo "#include "\"$(APP2VERINFO)\" >> $(MISC)$/$(APP2LINKRES:b).rc
154 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
155 .ENDIF # "$(APP2LINKRES)" != ""
157 @-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
159 .IF "$(APP3VERINFO)" != ""
160 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
161 - @-+echo #include "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
162 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP3LINKRES:b).rc
163 + @-+echo "#include "\"$(APP3VERINFO)\" >> $(MISC)$/$(APP3LINKRES:b).rc
165 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
166 .ENDIF # "$(APP3LINKRES)" != ""
168 @-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
170 .IF "$(APP4VERINFO)" != ""
171 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
172 - @-+echo #include "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
173 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP4LINKRES:b).rc
174 + @-+echo "#include "\"$(APP4VERINFO)\" >> $(MISC)$/$(APP4LINKRES:b).rc
176 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
177 .ENDIF # "$(APP4LINKRES)" != ""
179 @-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
181 .IF "$(APP5VERINFO)" != ""
182 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
183 - @-+echo #include "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
184 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP5LINKRES:b).rc
185 + @-+echo "#include \"$(APP5VERINFO)\" >> $(MISC)$/$(APP5LINKRES:b).rc
187 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
188 .ENDIF # "$(APP5LINKRES)" != ""
189 @@ -1093,8 +1093,8 @@
190 @-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
192 .IF "$(APP6VERINFO)" != ""
193 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
194 - @-+echo #include "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
195 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP6LINKRES:b).rc
196 + @-+echo "#include "\"$(APP6VERINFO)\" >> $(MISC)$/$(APP6LINKRES:b).rc
198 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
199 .ENDIF # "$(APP6LINKRES)" != ""
200 @@ -1289,8 +1289,8 @@
201 @-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
203 .IF "$(APP7VERINFO)" != ""
204 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
205 - @-+echo #include "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
206 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP7LINKRES:b).rc
207 + @-+echo "#include "\"$(APP7VERINFO)\" >> $(MISC)$/$(APP7LINKRES:b).rc
209 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
210 .ENDIF # "$(APP7LINKRES)" != ""
211 @@ -1485,8 +1485,8 @@
212 @-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
214 .IF "$(APP8VERINFO)" != ""
215 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
216 - @-+echo #include "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
217 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP8LINKRES:b).rc
218 + @-+echo "#include "\"$(APP8VERINFO)\" >> $(MISC)$/$(APP8LINKRES:b).rc
220 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
221 .ENDIF # "$(APP8LINKRES)" != ""
222 @@ -1681,8 +1681,8 @@
223 @-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
225 .IF "$(APP9VERINFO)" != ""
226 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
227 - @-+echo #include "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
228 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP9LINKRES:b).rc
229 + @-+echo "#include "\"$(APP9VERINFO)\" >> $(MISC)$/$(APP9LINKRES:b).rc
231 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
232 .ENDIF # "$(APP9LINKRES)" != ""
233 @@ -1877,8 +1877,8 @@
234 @-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
236 .IF "$(APP10VERINFO)" != ""
237 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
238 - @-+echo #include "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
239 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP10LINKRES:b).rc
240 + @-+echo "#include "\"$(APP10VERINFO)\" >> $(MISC)$/$(APP10LINKRES:b).rc
242 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
243 .ENDIF # "$(APP10LINKRES)" != ""
244 --- oo_1.0_src/solenv/inc/_tg_shl.mk.suxx Fri Jun 14 11:31:07 2002
245 +++ oo_1.0_src/solenv/inc/_tg_shl.mk Fri Jun 14 11:43:39 2002
246 @@ -231,15 +231,15 @@
248 .IF "$(use_shl_versions)" != ""
249 .IF "$(USE_SHELL)"!="4nt"
250 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
251 - @-+echo #define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
252 - @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
253 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
254 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
255 + @-+echo "#define ORG_NAME" $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
256 + @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
257 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
258 .ELSE # "$(USE_SHELL)"!="4nt"
259 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
260 - @-+echo #define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
261 - @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
262 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
263 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
264 + @-+echo "#define ORG_NAME" $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
265 + @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
266 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
267 .ENDIF # "$(USE_SHELL)"!="4nt"
268 .ENDIF # "$(use_shl_versions)" != ""
269 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
270 @@ -693,15 +693,15 @@
272 .IF "$(use_shl_versions)" != ""
273 .IF "$(USE_SHELL)"!="4nt"
274 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
275 - @-+echo #define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
276 - @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
277 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
278 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
279 + @-+echo "#define ORG_NAME" $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
280 + @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
281 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
282 .ELSE # "$(USE_SHELL)"!="4nt"
283 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
284 - @-+echo #define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
285 - @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
286 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
287 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
288 + @-+echo "#define ORG_NAME" $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
289 + @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
290 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
291 .ENDIF # "$(USE_SHELL)"!="4nt"
292 .ENDIF # "$(use_shl_versions)" != ""
293 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
294 @@ -1155,15 +1155,15 @@
296 .IF "$(use_shl_versions)" != ""
297 .IF "$(USE_SHELL)"!="4nt"
298 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
299 - @-+echo #define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
300 - @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
301 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
302 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
303 + @-+echo "#define ORG_NAME" $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
304 + @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
305 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
306 .ELSE # "$(USE_SHELL)"!="4nt"
307 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
308 - @-+echo #define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
309 - @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
310 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
311 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
312 + @-+echo "#define ORG_NAME" $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
313 + @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
314 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
315 .ENDIF # "$(USE_SHELL)"!="4nt"
316 .ENDIF # "$(use_shl_versions)" != ""
317 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
318 @@ -1617,15 +1617,15 @@
320 .IF "$(use_shl_versions)" != ""
321 .IF "$(USE_SHELL)"!="4nt"
322 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
323 - @-+echo #define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
324 - @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
325 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
326 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
327 + @-+echo "#define ORG_NAME" $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
328 + @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
329 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
330 .ELSE # "$(USE_SHELL)"!="4nt"
331 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
332 - @-+echo #define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
333 - @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
334 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
335 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
336 + @-+echo "#define ORG_NAME" $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
337 + @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
338 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
339 .ENDIF # "$(USE_SHELL)"!="4nt"
340 .ENDIF # "$(use_shl_versions)" != ""
341 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
342 @@ -2079,15 +2079,15 @@
344 .IF "$(use_shl_versions)" != ""
345 .IF "$(USE_SHELL)"!="4nt"
346 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
347 - @-+echo #define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
348 - @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
349 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
350 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
351 + @-+echo "#define ORG_NAME" $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
352 + @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
353 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
354 .ELSE # "$(USE_SHELL)"!="4nt"
355 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
356 - @-+echo #define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
357 - @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
358 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
359 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
360 + @-+echo "#define ORG_NAME" $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
361 + @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
362 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
363 .ENDIF # "$(USE_SHELL)"!="4nt"
364 .ENDIF # "$(use_shl_versions)" != ""
365 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
366 @@ -2541,15 +2541,15 @@
368 .IF "$(use_shl_versions)" != ""
369 .IF "$(USE_SHELL)"!="4nt"
370 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
371 - @-+echo #define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
372 - @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
373 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
374 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
375 + @-+echo "#define ORG_NAME" $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
376 + @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
377 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
378 .ELSE # "$(USE_SHELL)"!="4nt"
379 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
380 - @-+echo #define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
381 - @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
382 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
383 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
384 + @-+echo "#define ORG_NAME" $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
385 + @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
386 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
387 .ENDIF # "$(USE_SHELL)"!="4nt"
388 .ENDIF # "$(use_shl_versions)" != ""
389 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
390 @@ -3003,15 +3003,15 @@
392 .IF "$(use_shl_versions)" != ""
393 .IF "$(USE_SHELL)"!="4nt"
394 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
395 - @-+echo #define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
396 - @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
397 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
398 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
399 + @-+echo "#define ORG_NAME" $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
400 + @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
401 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
402 .ELSE # "$(USE_SHELL)"!="4nt"
403 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
404 - @-+echo #define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
405 - @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
406 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
407 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
408 + @-+echo "#define ORG_NAME" $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
409 + @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
410 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
411 .ENDIF # "$(USE_SHELL)"!="4nt"
412 .ENDIF # "$(use_shl_versions)" != ""
413 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
414 @@ -3465,15 +3465,15 @@
416 .IF "$(use_shl_versions)" != ""
417 .IF "$(USE_SHELL)"!="4nt"
418 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
419 - @-+echo #define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
420 - @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
421 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
422 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
423 + @-+echo "#define ORG_NAME" $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
424 + @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
425 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
426 .ELSE # "$(USE_SHELL)"!="4nt"
427 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
428 - @-+echo #define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
429 - @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
430 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
431 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
432 + @-+echo "#define ORG_NAME" $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
433 + @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
434 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
435 .ENDIF # "$(USE_SHELL)"!="4nt"
436 .ENDIF # "$(use_shl_versions)" != ""
437 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
438 @@ -3927,15 +3927,15 @@
440 .IF "$(use_shl_versions)" != ""
441 .IF "$(USE_SHELL)"!="4nt"
442 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
443 - @-+echo #define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
444 - @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
445 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
446 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
447 + @-+echo "#define ORG_NAME" $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
448 + @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
449 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
450 .ELSE # "$(USE_SHELL)"!="4nt"
451 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
452 - @-+echo #define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
453 - @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
454 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
455 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
456 + @-+echo "#define ORG_NAME" $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
457 + @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
458 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
459 .ENDIF # "$(USE_SHELL)"!="4nt"
460 .ENDIF # "$(use_shl_versions)" != ""
461 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
462 @@ -4389,15 +4389,15 @@
464 .IF "$(use_shl_versions)" != ""
465 .IF "$(USE_SHELL)"!="4nt"
466 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
467 - @-+echo #define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
468 - @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
469 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
470 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
471 + @-+echo "#define ORG_NAME" $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
472 + @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
473 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
474 .ELSE # "$(USE_SHELL)"!="4nt"
475 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
476 - @-+echo #define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
477 - @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
478 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
479 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
480 + @-+echo "#define ORG_NAME" $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
481 + @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
482 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
483 .ENDIF # "$(USE_SHELL)"!="4nt"
484 .ENDIF # "$(use_shl_versions)" != ""
485 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
486 --- oo_1.0_src/solenv/inc/tg_app.mk.suxx Fri Jun 14 11:31:29 2002
487 +++ oo_1.0_src/solenv/inc/tg_app.mk Fri Jun 14 11:44:23 2002
489 @-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
491 .IF "$(APP$(TNR)VERINFO)" != ""
492 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
493 - @-+echo #include "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
494 + @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
495 + @-+echo "#include "\"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
497 $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
498 .ENDIF # "$(APP$(TNR)LINKRES)" != ""
499 --- oo_1.0_src/solenv/inc/tg_dep.mk.suxx Fri Jun 14 11:31:37 2002
500 +++ oo_1.0_src/solenv/inc/tg_dep.mk Fri Jun 14 11:44:35 2002
502 @echo "#" > $(MISC)$/$(TARGET).dpw
504 .ELSE # "$(GUI)"=="UNX"
505 - @echo # > $(MISC)$/$(TARGET).dpc
506 + @echo "#" > $(MISC)$/$(TARGET).dpc
507 .IF "$(GROUP)"=="WRITER"
508 - @echo # > $(MISC)$/$(TARGET).dpw
509 + @echo "#" > $(MISC)$/$(TARGET).dpw
511 .ENDIF # "$(GUI)"=="UNX"
513 --- oo_1.0_src/solenv/inc/tg_shl.mk.suxx Fri Jun 14 11:31:45 2002
514 +++ oo_1.0_src/solenv/inc/tg_shl.mk Fri Jun 14 11:45:07 2002
515 @@ -331,15 +331,15 @@
517 .IF "$(use_shl_versions)" != ""
518 .IF "$(USE_SHELL)"!="4nt"
519 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
520 - @-+echo #define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
521 - @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
522 - @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
523 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
524 + @-+echo "#define ORG_NAME" $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
525 + @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
526 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
527 .ELSE # "$(USE_SHELL)"!="4nt"
528 - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
529 - @-+echo #define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
530 - @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
531 - @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
532 + @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
533 + @-+echo "#define ORG_NAME" $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
534 + @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
535 + @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
536 .ENDIF # "$(USE_SHELL)"!="4nt"
537 .ENDIF # "$(use_shl_versions)" != ""
538 $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
539 --- oo_1.0_src/tools/os2/source/wps/makefile.mk.suxx Fri Jun 14 11:47:53 2002
540 +++ oo_1.0_src/tools/os2/source/wps/makefile.mk Fri Jun 14 11:48:23 2002
542 @+if exist $(INCCOM)$/wpsdll.h rm -f $(INCCOM)$/wpsdll.h
543 @echo ----------------------------
545 - @echo #define _WPS_DLL_NAME "$(SHL1TARGET).dll" > $(INCCOM)$/wpsdll.h
546 - @echo #define _TEMPLATES_DLL_NAME "$(SHL2TARGET)" >> $(INCCOM)$/wpsdll.h
547 + @echo "#define _WPS_DLL_NAME "\"$(SHL1TARGET).dll\" > $(INCCOM)$/wpsdll.h
548 + @echo "#define _TEMPLATES_DLL_NAME "\"$(SHL2TARGET)\" >> $(INCCOM)$/wpsdll.h
551 @echo ----------------------------