diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:06:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:06:21 +0000 |
| commit | a4eec387e6c0e62785d29f810a40b26e8a2fea5f (patch) | |
| tree | 79f755d18866595229dab14b1b43522b9c1d854b /solenv/inc/startup | |
| parent | b25e76d7cf27aa0f548a19ce6528eadcaf1fac15 (diff) | |
INTEGRATION: CWS ause058 (1.17.40); FILE MERGED
2006/06/22 13:17:40 hjs 1.17.40.1: #i58890# applied iz58890_3.diff
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 1834bfd538c4..e6b57692320e 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -23,6 +23,7 @@ SHELL *:= $(COMSPEC) SHELLFLAGS *:= $(SWITCHAR)c GROUPFLAGS *:= $(SHELLFLAGS) SHELLMETAS *:= "<>| +# Fix syntax highlighting: " GROUPSUFFIX *:= .bat DIVFILE *= $(TMPFILE:s,/,\,) RM *= del @@ -36,10 +37,17 @@ SHELL *:= $(COMSPEC) .EXPORT : PWD .ELSE # Non 4nt case -# See iz50689 why -f is needed. + +.IF $(USE_SHELL) == bash + SHELLFLAGS *:= -c +.ELSE + # See iz50689 why -f is needed. SHELLFLAGS *:= -fc +.ENDIF # $(USE_SHELL) == bash + GROUPFLAGS *:= SHELLMETAS *:= *";?<>|()&][$$\#`' +# Fix syntax highlighting: " GROUPSUFFIX *:= .csh # This is hopefully not used. Only in: dmake/msdos/spawn.c # .MKSARGS *:= yes |