diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-07 21:08:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-10 10:08:31 +0300 |
| commit | d83f28a2505923a4f01237f7587bf8ede57d0bed (patch) | |
| tree | b55a33fe109f94c3a2a8585406ff616cc0dac2c7 | |
| parent | 3369185bddc4ece889381511055917e58a42a837 (diff) | |
Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/java
Makes CppunitTest_dbaccess_hsqldb_test work also in the
--enable-canonical-installation-tree-structure (on OS X), otherwise
the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc)
in stoc/source/javavm/javavm.cxx fails.
Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ure/source/unorc.in (renamed from ure/source/unorc) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dcf3b69fa71f..898bb531f437 100644 --- a/configure.ac +++ b/configure.ac @@ -13053,7 +13053,8 @@ AC_CONFIG_FILES([config_host.mk lo.xcent instsetoo_native/util/openoffice.lst sysui/desktop/macosx/Info.plist - ios/lo.xcconfig]) + ios/lo.xcconfig + ure/source/unorc]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_eot.h]) diff --git a/ure/source/unorc b/ure/source/unorc.in index 1efbfe206271..29f3ded71af5 100644 --- a/ure/source/unorc +++ b/ure/source/unorc.in @@ -17,7 +17,7 @@ # [Bootstrap] URE_INTERNAL_LIB_DIR=${ORIGIN} -URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java +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} UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES} |