diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:34:30 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:34:30 +0100 |
| commit | ba2064a80f21ab80f7be7ab1cadad7ca5240798c (patch) | |
| tree | 1370c8e0ddd8d744ab2011a60238c03f9b8316e0 /desktop | |
| parent | 8cb43325fa91c2b271c0eede0301048727cdeac3 (diff) | |
| parent | 25854c79e4b4ec8ccb7eaa0e2f837312c1efcc81 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/soffice.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 427f6414605e..80264e6f446a 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -76,6 +76,20 @@ OpenBSD) ;; esac +# this is a temporary hack until we can live with the default search paths +case "`uname -s`" in +OpenBSD) + 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}} + JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) + export LD_LIBRARY_PATH + if [ -n "${JAVA_HOME}" ]; then + export JAVA_HOME + fi + ;; +esac + #collect all bootstrap variables specified on the command line #so that they can be passed as arguments to javaldx later on for arg in $@ |