diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-08 16:08:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:11 +0200 |
| commit | 25dc151c2bd592eb41834df29e62a7a467d13fc6 (patch) | |
| tree | 3c177eef769aa3ced7095ab0f725c7d03d84a206 /instsetoo_native | |
| parent | 2e5af9dc4fe88fead050ebe08f2b2d044124e7ce (diff) | |
add back HSQLDB_JAR to URE_MORE_JAVA_CLASSPATH_URLS
Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 55624ce4f72d..930e66d25bc9 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -55,7 +55,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \ && echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}' \ && echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/bin)' \ - && echo 'URE_MORE_JAVA_CLASSPATH_URLS=' \ + && echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if $(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \ && echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \ && echo 'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml' \ && echo 'URE_LIB_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)' \ |