INTEGRATION: CWS dmake411 (1.2.28); FILE MERGED

2007/09/19 00:34:34 vq 1.2.28.1: #i81252# Add a new SHELLCMDQUOTE control macro.

dmake/startup/win95/macros.mk

@@ -33,9 +33,20 @@ V *:= 		# RCS suffix
 # are going to use.  COMSPEC (assumed to be command.com) or
 # MKS Korn shell.
 .IF $(SHELL) == $(COMSPEC)
+.IF $(COMSPEC:lf) == cmd.exe
+   SHELLFLAGS       *:= $(SWITCHAR)S $(SWITCHAR)c
+   SHELLCMDQUOTE    *:= "
+# " fix syntax highlighting
+.ELIF $(COMSPEC:lf) == command.com
    SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
+   SHELLCMDQUOTE    *:= "
+# " fix syntax highlighting
+.ELSE
+   SHELLFLAGS       *:= $(SWITCHAR)c
+.END
+   GROUPFLAGS       *:= $(SWITCHAR)c
    SHELLMETAS       *:= "<>|
+# " fix syntax highlighting
    GROUPSUFFIX      *:= .bat
    DIVFILE          *=  $(TMPFILE:s,/,\,)
    RM               *=  del

dmake/startup/winnt/macros.mk

@@ -33,9 +33,20 @@ V *:= 		# RCS suffix
 # are going to use.  COMSPEC (assumed to be command.com) or
 # MKS Korn shell.
 .IF $(SHELL) == $(COMSPEC)
+.IF $(COMSPEC:lf) == cmd.exe
+   SHELLFLAGS       *:= $(SWITCHAR)S $(SWITCHAR)c
+   SHELLCMDQUOTE    *:= "
+# " fix syntax highlighting
+.ELIF $(COMSPEC:lf) == command.com
    SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
+   SHELLCMDQUOTE    *:= "
+# " fix syntax highlighting
+.ELSE
+   SHELLFLAGS       *:= $(SWITCHAR)c
+.END
+   GROUPFLAGS       *:= $(SWITCHAR)c
    SHELLMETAS       *:= "<>|
+# " fix syntax highlighting
    GROUPSUFFIX      *:= .cmd
    DIVFILE          *=  $(TMPFILE:s,/,\,)
    RM               *=  del