diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-07 21:41:41 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-23 09:50:16 +0300 |
| commit | 1766aa619045306b3247aede7c718bef3dcffd0f (patch) | |
| tree | 864ce581af8d1f70548051d9c0cf489e78f8d116 /ure | |
| parent | 65f9331ceeaff37dd48d2a1ffa788646b7ef57d0 (diff) | |
Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIR
In the --enable-canonical-installation-tree-structure case (on OS X),
the URE unorc is definitely not in the same place as any libs. Noticed
in JunitTest_comphelper_complex.
Change-Id: Ic6097021f9abc081e2a7c7aac25286ad2c4b75e5
(cherry picked from commit e24d3ff2cd9e2da4c81105d2e9dbee6187fac55f)
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/unorc.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ure/source/unorc.in b/ure/source/unorc.in index 29f3ded71af5..bc0ecbe19d60 100644 --- a/ure/source/unorc.in +++ b/ure/source/unorc.in @@ -16,7 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # [Bootstrap] -URE_INTERNAL_LIB_DIR=${ORIGIN} +URE_INTERNAL_LIB_DIR=${BRAND_BASE_DIR}/@LIBO_URE_LIB_FOLDER@ URE_INTERNAL_JAVA_DIR=${BRAND_BASE_DIR}/@LIBO_URE_SHARE_JAVA_FOLDER@ URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES} UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES} |