From 45ca1bfc22f5d6857aeefc1e444f369cf6519805 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 28 Nov 2014 11:48:22 +0100
Subject: 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
---
 svx/source/gengal/gengal.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'svx')

diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 9b342854f594..7535e25b5c6b 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.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
-- 
cgit