summaryrefslogtreecommitdiff
path: root/solenv/inc/unx.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc/unx.mk')
-rw-r--r--solenv/inc/unx.mk15
1 files changed, 1 insertions, 14 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index c6d756343d79..eb27b51a6e6d 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -198,17 +198,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