diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-08 00:33:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-23 09:50:20 +0300 |
| commit | d38ca60679915e9361fdfb83ba888a577cf247bb (patch) | |
| tree | 3368b363d1b9fd23fe1a652d5564d5d648493d3c /scp2 | |
| parent | f5f1f8332584a1bbc1d1a8a688fb3d0bce24a5dd (diff) | |
Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDER
Needed in case of --enable-canonical-installation-tree-structure.
Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
(cherry picked from commit 5e5aa9b08a39530b0b117141f0f65d1dc2dad84e)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 323289d5ba5c..562cad798213 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1185,7 +1185,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; + Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/unoil.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data @@ -1223,7 +1223,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir #if defined WNT Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin"; #else - Value = "${BRAND_BASE_DIR}/ure-link/bin"; + Value = "${BRAND_BASE_DIR}/" LIBO_URE_BIN_FOLDER; #endif End |