diff options
| author | sb <sb@openoffice.org> | 2010-01-11 17:37:16 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-11 17:37:16 +0100 |
| commit | 140885c51943d08fb8cb0faa6f4e84c426860d4e (patch) | |
| tree | a686bef887cf41bd657d0d4a198929bccc684610 /solenv | |
| parent | sb118: removed left-over obsolete IRIX directory (diff) | |
| download | core-140885c51943d08fb8cb0faa6f4e84c426860d4e.tar.gz core-140885c51943d08fb8cb0faa6f4e84c426860d4e.zip | |
sb118: fixed and improved previous AUGMENT_LIBRARY_PATH_LOCAL change
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 21 | ||||
| -rw-r--r-- | solenv/inc/wnt.mk | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 0974277ae68b..9aa3ee5ab077 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1037,21 +1037,22 @@ LNTFLAGSOUTOBJ=-os # 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 *= : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(SOLARLIBDIR) -AUGMENT_LIBRARY_PATH_LOCAL *= : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(PWD)/$(LB):$(SOLARLIBDIR) +AUGMENT_LIBRARY_PATH = : && \ + $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(SOLARSHAREDBIN)) +AUGMENT_LIBRARY_PATH_LOCAL = : && \ + $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN)) .ELSE -AUGMENT_LIBRARY_PATH *= if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ +AUGMENT_LIBRARY_PATH = if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ - "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(SOLARLIBDIR)"' \ + "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(normpath, $(SOLARSHAREDBIN))"' \ && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ - setenv $(OOO_LIBRARY_PATH_VAR) "$(SOLARLIBDIR)" && -AUGMENT_LIBRARY_PATH_LOCAL *= if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ + setenv $(OOO_LIBRARY_PATH_VAR) "$(normpath, $(SOLARSHAREDBIN))" && +AUGMENT_LIBRARY_PATH_LOCAL = if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ - "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(PWD)/$(LB):$(SOLARLIBDIR)"' \ + "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))"' \ && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ - setenv $(OOO_LIBRARY_PATH_VAR) "$(PWD)/$(LB):$(SOLARLIBDIR)" && + setenv $(OOO_LIBRARY_PATH_VAR) \ + "$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))" && .END .END diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index b170db530346..e516b5e44bc1 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -74,7 +74,3 @@ JAVA_RUNTIME=javai_g.lib .ENDIF OOO_LIBRARY_PATH_VAR = PATH -AUGMENT_LIBRARY_PATH = : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(SOLARBINDIR:s/://:^"/cygdrive/") -AUGMENT_LIBRARY_PATH_LOCAL = : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(PWD:s/://:^"/cygdrive/")/$(LB):$(SOLARBINDIR:s/://:^"/cygdrive/") |