diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:45:53 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:45:53 +0000 |
commit | 84953a4a07c1a4f9a60ea8b2cd27498354128591 (patch) | |
tree | 8deca0efebac8bf8ba73c92ac523d1ae81667e18 /solenv/inc/unxsols4.mk | |
parent | 0adc82eb7512c55bc912a1a615df742528124291 (diff) |
INTEGRATION: CWS jsc21 (1.48.30); FILE MERGED
2008/07/04 11:34:25 jsc 1.48.30.5: RESYNC: (1.50-1.52); FILE MERGED
2008/06/11 14:44:59 sb 1.48.30.4: RESYNC: (1.49-1.50); FILE MERGED
2008/04/23 09:50:48 jsc 1.48.30.3: RESYNC: (1.48-1.49); FILE MERGED
2008/04/11 12:37:15 jsc 1.48.30.2: #i86121# new rpath option for SDK related tools
2008/04/11 12:20:17 jsc 1.48.30.1: #i86121# new rpath option for SDK related tools
Diffstat (limited to 'solenv/inc/unxsols4.mk')
-rw-r--r-- | solenv/inc/unxsols4.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 90a9575eea24..06e9d50d78b6 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -8,7 +8,7 @@ # # $RCSfile: unxsols4.mk,v $ # -# $Revision: 1.52 $ +# $Revision: 1.53 $ # # This file is part of OpenOffice.org. # @@ -139,6 +139,7 @@ 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_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= |