diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-06 15:19:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-06 15:19:39 +0000 |
| commit | 97bbbe987713561358c778048dc3acd42f57fa1c (patch) | |
| tree | e4f20e139f6e61dcfc5255c1d5dac73dc4712602 /solenv/inc/startup | |
| parent | 89ba47c4a935ab27600a8cf12d9e72e9d47b8886 (diff) | |
INTEGRATION: CWS vq28 (1.15.266); FILE MERGED
2006/02/05 04:18:39 vq 1.15.266.3: #i61212# Don't overwrite the PWD macro if it's not needed.
2006/02/03 14:12:07 vq 1.15.266.2: #i61212# Revert changes.
2006/01/30 01:53:03 vq 1.15.266.1: #i61212# Remove code that overrides dmake's PWD macro.
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index b41f7d021a36..ac8593375a0c 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -41,6 +41,7 @@ E *:= .exe # Executables __.DIVSEP-sh-yes *:= \\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR := \\ +# See iz61212 for the reason why PWD is overwritten PWD:=$(shell +echo %_cwd) .EXPORT : PWD @@ -59,8 +60,6 @@ E *:= .exe # Executables __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ -# See IZ 11093 why PWD has to be overwritten - PWD:=$(shell +pwd) .EXPORT : PWD .ENDIF |