summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brinkmann <hbrinkm@openoffice.org>2010-09-10 17:42:43 +0200
committerHenning Brinkmann <hbrinkm@openoffice.org>2010-09-10 17:42:43 +0200
commit615fec30a2bbde2350fa71db76ba2e702a14fcf9 (patch)
tree7337a9080ebf306e4ad632ec468a8e1e9814b45d
parent8c29f37b193ac59d62879b0303a997f09613e1db (diff)
parent33192399848807a2029ecf398f843c2810e4f894 (diff)
merged changes by sb
-rw-r--r--pyuno/zipcore/python.sh2
-rw-r--r--ure/source/startup.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index 680c6a241572..b57bc6c3e3b6 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 6d79b8d72060..7130d172809b 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