diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:30:59 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:30:59 +0200 |
commit | 1c5abcbd60de25c5e97218c8ecbf27560cfbab4f (patch) | |
tree | b7ea0f5d8383348de2c9a17d2c6127a8e7a44c2f /desktop/scripts | |
parent | 8694d2bc19ea6b531e85ac8135de34dc99956bca (diff) | |
parent | b52411d425729abc07766b4568e02d7e30f08a23 (diff) |
Merge commit 'ooo/OOO330_m10'
Diffstat (limited to 'desktop/scripts')
-rw-r--r-- | desktop/scripts/soffice.sh | 2 | ||||
-rw-r--r-- | desktop/scripts/unopkg.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index df11ec5c13e3..710b485e343b 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -121,7 +121,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 0fe319735c06..1f09b87eb1ef 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -57,7 +57,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi |