diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:59:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:59:17 +0000 |
| commit | dc937ece091f24fa24805ae7ceb6366e9c560b15 (patch) | |
| tree | 5e3e1474c3958df67a54fe789de4961c66148a05 /solenv/inc/startup | |
| parent | 8e2de223fd5904f4c6dda6a0007eb62e751884a4 (diff) | |
INTEGRATION: CWS ause069 (1.18.126); FILE MERGED
2006/10/11 12:36:27 hjs 1.18.126.1: #i70359#: removing + sign in targets; adding to tool macro if required
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index fab9199a8d7c..7481860652ad 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -22,18 +22,18 @@ SHELL *:= $(COMSPEC) SHELLFLAGS *:= $(SWITCHAR)c GROUPFLAGS *:= $(SHELLFLAGS) - SHELLMETAS *:= "<>|%& + SHELLMETAS *:= "<>|&%^ # Fix syntax highlighting: " GROUPSUFFIX *:= .bat DIVFILE *= $(TMPFILE:s,/,\,) - RM *= del + RM *= +del RMFLAGS *= /y /E - MV *= rename + MV *= +rename __.DIVSEP-sh-yes *:= \\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR := \\ # See iz61212 for the reason why PWD is overwritten - PWD:=$(shell +echo %_cwd) + PWD:=$(shell echo %_cwd) .EXPORT : PWD .ELSE # Non 4nt case @@ -64,7 +64,7 @@ SHELL *:= $(COMSPEC) .IF $(USE_SHELL) == 4nt -my4ver:=$(shell +echo %_4ver) +my4ver:=$(shell echo %_4ver) .IF "$(my4ver:s/.//:s/,//)" >= "400" .ELSE # "$(my4ver:s/.//:s/,//)" >= "400" |