diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2013-06-07 12:28:39 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2013-06-07 12:28:39 +0000 |
| commit | 25d6618a9725d6bdba64ae4d46e32eb024b747fc (patch) | |
| tree | 7716f4f84d2e9132ee25dedcdb0ff099761ab183 /padmin | |
| parent | a673974e2026fe379f9c3e316c0dbd6baec3d657 (diff) | |
#122478# further cleanup for 3layer changes
Notes
Notes:
prefer: b786a33cfdca2e8a4114ddef0340e0e0628dd09c
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/spadmin.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh index dc5919eff97b..be4082212736 100644 --- a/padmin/source/spadmin.sh +++ b/padmin/source/spadmin.sh @@ -47,17 +47,15 @@ do done # extend the ld_library_path for java: javaldx checks the sofficerc for us -if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then +if [ -x "$sd_prog/javaldx" ] ; then # this is a temporary hack until we can live with the default search paths case "`uname -s`" in FreeBSD) - sd_prog1="$sd_prog/../basis-link/program" - sd_prog2="$sd_prog/../basis-link/ure-link/lib" - LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} + LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH ;; esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ + my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ "-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} @@ -75,5 +73,5 @@ PATH=$sd_prog${PATH+:$PATH} export PATH # execute binary -exec "$sd_prog/../basis-link/program/spadmin.bin" "$@" \ +exec "$sd_prog/spadmin.bin" "$@" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" |