diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:48:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
| commit | 45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch) | |
| tree | 47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /desktop | |
| parent | eef94c1655605ce890f182e31f3cc64ee3748625 (diff) | |
Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).
Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 6 | ||||
| -rwxr-xr-x | desktop/scripts/unoinfo.sh | 2 | ||||
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 26fb7767517b..b1ab4c99d361 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -130,9 +130,7 @@ fi case "`uname -s`" in NetBSD|OpenBSD|FreeBSD|DragonFly) # this is a temporary hack until we can live with the default search paths - sd_prog1="$sd_prog" - sd_prog2="$sd_prog/../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} JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH if [ -n "${JAVA_HOME}" ]; then @@ -140,7 +138,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) fi ;; AIX) - LIBPATH=$sd_prog:$sd_prog/../ure-link/lib${LIBPATH:+:$LIBPATH} + LIBPATH=$sd_prog${LIBPATH:+:$LIBPATH} export LIBPATH ;; esac diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index 74a3333b0c4c..edadbc00de60 100755 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -31,7 +31,7 @@ sd_prog=`pwd` case $1 in c++) - printf '%s' "$sd_prog/../ure-link/lib" + printf '%s' "$sd_prog" ;; java) printf '0%s\0%s\0%s\0%s\0%s' \ diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 3d244a438e18..f21e4d1193b7 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -36,9 +36,7 @@ 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" - sd_prog2="$sd_prog/../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}} JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH if [ -n "${JAVA_HOME}" ]; then @@ -46,9 +44,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) fi ;; AIX) - sd_prog1="$sd_prog" - sd_prog2="$sd_prog/../ure-link/lib" - LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}} + LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}} export LIBPATH ;; esac |