diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:47:26 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:47:26 +0000 |
| commit | 3e8cbc22585f5f4684bade16a70cb17808fcfdf6 (patch) | |
| tree | 26d0770270a37fc356958a080cd9ea4b272001ee /dmake | |
| parent | b4f433a438875ed855710a66ed0d3dbbaadaf33f (diff) | |
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.
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/startup/win95/macros.mk | 13 | ||||
| -rw-r--r-- | dmake/startup/winnt/macros.mk | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/dmake/startup/win95/macros.mk b/dmake/startup/win95/macros.mk index 992d69ea3625..5490634e6762 100644 --- a/dmake/startup/win95/macros.mk +++ b/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 diff --git a/dmake/startup/winnt/macros.mk b/dmake/startup/winnt/macros.mk index ff97d3875c2e..507773b36c45 100644 --- a/dmake/startup/winnt/macros.mk +++ b/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 |