diff options
| author | sb <sb@openoffice.org> | 2009-12-18 16:01:47 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-12-18 16:01:47 +0100 |
| commit | 93eb29213276ff5db32f9f6cde9416f97b3a5b02 (patch) | |
| tree | e6fe3145c0067cbb3e8475eda0e03c528bfc6146 /solenv/inc/wnt.mk | |
| parent | 142fb452faba13ab6f8c407ce4ed8c8b701a76f8 (diff) | |
sb118: redesigned AUGMENT_LIBRARY_PATH to make the modified OOO_LIBRARY_PATH_VAR available (to mechanisms that want to recursively undo the modifications again)
Diffstat (limited to 'solenv/inc/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 6acab30cc80d..0b5772833580 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -73,9 +73,6 @@ JAVA_RUNTIME=javai_g.lib .ENDIF .ENDIF -.IF "$(USE_SHELL)" == "bash" -AUGMENT_LIBRARY_PATH *= : && \ - PATH=$${{PATH}}:$(SOLARBINDIR:s/://:^"/cygdrive/") -.ELSE -AUGMENT_LIBRARY_PATH *= echos && PATH=%PATH%;$(SOLARBINDIR) && -.ENDIF +OOO_LIBRARY_PATH_VAR = PATH +AUGMENT_LIBRARY_PATH = : && \ + $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(SOLARBINDIR:s/://:^"/cygdrive/") |