summaryrefslogtreecommitdiffstats
path: root/solenv/inc/unxsoli4.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-06 21:28:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-06 22:36:30 +0200
commit243ead838369b030579f501ce1f77689ce822f06 (patch)
tree38f1250a9e76b7621aef6aa82746c1119b92e5a4 /solenv/inc/unxsoli4.mk
parentPage Break: implemented final paint of the indicator and its line length (diff)
downloadcore-243ead838369b030579f501ce1f77689ce822f06.tar.gz
core-243ead838369b030579f501ce1f77689ce822f06.zip
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'solenv/inc/unxsoli4.mk')
-rw-r--r--solenv/inc/unxsoli4.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index c21c36237e87..aacf1d9a760f 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -130,9 +130,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd