Kaydet (Commit) d83f28a2 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 3369185b
......@@ -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])
......
......@@ -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}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment