[Libreoffice-commits] .: 6 commits - pyuno/zipcore ure/source

[Jan Holesovsky]

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

New commits:
commit 8ef2ef302049b3956cc441f5114977dec532eed1
Merge: 2642945... 9f761a1...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 13 14:39:43 2010 +0200

    Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/ure

commit 2642945b62ea2868f03feb6e4a16529e749834d5
Merge: 07f0db7... b2f9f93...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 13 11:45:34 2010 +0200

    Merge commit 'ooo/OOO330_m10'

commit b2f9f93005e951c747a3a8f40dbd34edc859e213
Merge: d3aae8d... 77d00ef...
Author: obo <obo at openoffice.org>
Date:   Fri Oct 8 08:45:29 2010 +0200

    CWS-TOOLING: integrate CWS hb22

commit 77d00ef5cb79dd62aea1beb80aeea4fb655dbde9
Merge: c8973c9... d3aae8d...
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date:   Mon Sep 20 17:13:53 2010 +0200

    merged OOO330_m8

commit c8973c90d5306535ac9e187d6141c5f0f3dcc3d8
Merge: b549687... 8f59192...
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date:   Fri Sep 10 17:42:43 2010 +0200

    merged changes by sb

commit 8f59192de2aeac36867355b434f00c0b77889f35
Author: sb <sb at openoffice.org>
Date:   Thu Sep 9 10:48:03 2010 +0200

    hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one

diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index f471b1d..b53e369 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 70748f2..7f973c5 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