From b786a33cfdca2e8a4114ddef0340e0e0628dd09c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 21 Oct 2011 17:18:13 +0200
Subject: Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR
 and BaseInstallation.

---
 padmin/source/spadmin.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'padmin/source')

diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index c41d505ce149..ded0cb326a6b 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -45,14 +45,14 @@ cd "$sd_cwd"
 
 case "`uname -s`" in
     FreeBSD)
-        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}
         export LD_LIBRARY_PATH
         ;;
     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
         ;;
@@ -68,8 +68,8 @@ 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
-    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
+    my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \
         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
     if [ -n "$my_path" ] ; then
         sd_platform=`uname -s`
-- 
cgit