diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /desktop/scripts/unopkg.sh | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'desktop/scripts/unopkg.sh')
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 54918f0a17ae..9856d191b68f 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -45,8 +45,8 @@ cd "$sd_cwd" # this is a temporary hack until we can live with the default search paths case "`uname -s`" in NetBSD|OpenBSD|FreeBSD|DragonFly) - sd_prog1="$sd_prog/../basis-link/program" - sd_prog2="$sd_prog/../basis-link/ure-link/lib" + sd_prog1="$sd_prog" + sd_prog2="$sd_prog/../ure-link/lib" LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH @@ -55,8 +55,8 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) fi ;; AIX) - sd_prog1="$sd_prog/../basis-link/program" - sd_prog2="$sd_prog/../basis-link/ure-link/lib" + sd_prog1="$sd_prog" + sd_prog2="$sd_prog/../ure-link/lib" LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}} export LIBPATH ;; @@ -83,8 +83,8 @@ then 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 \ +if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then + my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then sd_platform=`uname -s` |