From 8f59192de2aeac36867355b434f00c0b77889f35 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 9 Sep 2010 10:48:03 +0200
Subject: hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one

---
 pyuno/zipcore/python.sh | 2 +-
 ure/source/startup.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index f471b1dfd..b53e369fe 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -44,7 +44,7 @@ PATH=$sd_prog${PATH+:$PATH}
 export PATH
 
 # Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so:
-LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 # Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
index 70748f262..7f973c5bf 100644
--- a/ure/source/startup.sh
+++ b/ure/source/startup.sh
@@ -39,7 +39,7 @@ epath=`dirname "$0"`
 if [ -x "${epath}/javaldx" ] ; then
     jpath=`"${epath}/javaldx" $my_envargs`
     if [ -n "${jpath}" ]; then
-        LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+        LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
         export LD_LIBRARY_PATH
     fi
 fi
-- 
cgit v1.2.3