diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:34 +0200 |
| commit | c7f1e7f7ef9ccc3e388ad32d0f45444f5b469adf (patch) | |
| tree | a6b4a3378dfa82dc6218b909d6d141c47af41775 | |
| parent | 0e46e6f9afc9b4b96d0a5d6cf49fdae42b699111 (diff) | |
| parent | 5c04ffa2a50e3d61cc9beae038e9069713cdefca (diff) | |
Merge commit 'ooo/OOO330_m10'
| -rw-r--r-- | pyuno/zipcore/python.sh | 2 | ||||
| -rw-r--r-- | 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 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 |