diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 21:12:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 22:06:28 +0200 |
| commit | 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 (patch) | |
| tree | 1119c8730bd6628f10923dc3357ecae7d71bad28 /desktop | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 2 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 4419ea077e98..23033498cd36 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -79,7 +79,7 @@ done if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ] then - JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' fi # extend the ld_library_path for java: javaldx checks the sofficerc for us diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index ec156d3ac8c4..3289d5b34285 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -415,7 +415,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() //for the admin. The value must also be set in the unopkg script (Linux, etc.) //when calling javaldx ::rtl::Bootstrap::set(OUSTR("UNO_JAVA_JFW_INSTALL_DATA"), - OUSTR("$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml")); + OUSTR("$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml")); } |