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/unx.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/unx.mk')
| -rw-r--r-- | solenv/inc/unx.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index bb5a4864484d..6a0fbe25f029 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -214,17 +214,4 @@ SOLARLIB+=-L$(KDE_ROOT)/lib .ENDIF # "$(KDE_ROOT)"!="" .ENDIF # "$(ENABLE_KDE)" != "" -# Add SOLARLIBDIR to the end of a (potentially previously undefined) -# LD_LIBRARY_PATH (there is no real reason to prefer adding at the end over -# adding at the start); the ": &&" in the bash case enables this to work at the -# start of a recipe line that is not prefixed by "+" as well as in the middle of -# an existing && chain; the tcsh case is somewhat imprecise in that it -# potentially affects multiple commands following on the recipe line: -.IF "$(USE_SHELL)" == "bash" -AUGMENT_LIBRARY_PATH *= : && \ - LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR) -.ELSE -AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \ - eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \ - if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" && -.ENDIF +OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH |