diff options
| author | sb <sb@openoffice.org> | 2010-09-09 10:48:03 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-09 10:48:03 +0200 |
| commit | 9f99b1dcfe826a7a79a11b3bd83871e3b4231b65 (patch) | |
| tree | e0b2d142c855a2f737ed1af590361d99c7aadff3 | |
| parent | b47d58784ee1d6592f721e9fa0a66a4d801e95cc (diff) | |
hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one
| -rw-r--r-- | desktop/scripts/soffice.sh | 2 | ||||
| -rw-r--r-- | desktop/scripts/unopkg.sh | 2 | ||||
| -rw-r--r-- | svx/source/gengal/gengal.sh | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index e2031c2f82..30e0f7d420 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -96,7 +96,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 5a8ee262ae..3f064448f5 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 diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh index 38e680e476..2fccd222fc 100644 --- a/svx/source/gengal/gengal.sh +++ b/svx/source/gengal/gengal.sh @@ -67,17 +67,17 @@ case $sd_platform in ;; Darwin) - DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH+:${DYLD_LIBRARY_PATH}} + DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} export DYLD_LIBRARY_PATH ;; HP-UX) - SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} + SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}} export SHLIB_PATH ;; *) - LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} + LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH ;; esac |