diff options
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/unoinfo.sh | 10 | ||||
| -rw-r--r-- | desktop/scripts/unopkg.sh | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index 82fbe57ba22c..bb10207a7e9b 100644 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -34,14 +34,14 @@ sd_prog=`pwd` case $1 in c++) - printf '%s' "$sd_prog/../basis-link/ure-link/lib" + printf '%s' "$sd_prog" ;; java) printf '0%s\0%s\0%s\0%s\0%s' \ - "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \ - "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \ - "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \ - "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog" + "$sd_prog/classes/ridl.jar" \ + "$sd_prog/classes/jurt.jar" \ + "$sd_prog/classes/java/juh.jar" \ + "$sd_prog/classes/unoil.jar" "$sd_prog" ;; *) exit 1 diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 71421e40de05..c0b5eac1a0d0 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -58,7 +58,7 @@ fi # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ + my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |