INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED

2005/04/09 21:22:33 vq 1.1.1.1.132.2: #i43254# Make the usage of DMAKEROOT consistent with the man page for
all OSs. This includes the removal of "SOLARVER UPD INPATH OS UPDMINOREXT"
from the list of macros that are always imported from the environment.
Patch inspired in part by shay@openoffice.org.
2005/04/08 15:26:20 vq 1.1.1.1.132.1: Issue number: 47004
Submitted by: shay@openoffice
Fix syntax errors (warnings) in subst macros.

dmake/startup/os2/macros.mk

@@ -7,7 +7,7 @@
 # Execution environment configuration.
 # Grab the current setting of COMSPEC.
 #
-.IMPORT .IGNORE : COMSPEC
+.IMPORT .IGNORE : COMSPEC ROOTDIR
 
 # First check if SHELL is defined to be something other than COMSPEC.
 # If it is assume that SHELL is a Korn compatible shell like MKS's
@@ -41,7 +41,7 @@ V *:= 		# RCS suffix
    SHELLMETAS       *:= *"?<>
    GROUPSUFFIX      *:= .bat
    DIRSEPSTR        *:= \\\
-   DIVFILE          *=  $(TMPFILE:s,/,\)
+   DIVFILE          *=  $(TMPFILE:s,/,\,)
    RM               *=  del
    RMFLAGS          *=
    MV	            *=  rename
@@ -54,7 +54,7 @@ V *:= 		# RCS suffix
    RM               *=  $(ROOTDIR)$/bin$/rm
    RMFLAGS          *=  -f
    MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
+   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
    __.DIVSEP-sh-yes !:= \\\
    __.DIVSEP-sh-no  !:= \\
 .ENDIF