diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:46:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:46:21 +0000 |
| commit | 6d8c754ad6c8fa7a47b129e2f094264288e4ce8d (patch) | |
| tree | 1826d0cace689e947210fe5d1747b265dc49f248 /desktop/scripts | |
| parent | 4d652a997308e285d9a141771e247f58e793904f (diff) | |
INTEGRATION: CWS sb42 (1.19.34); FILE MERGED
2006/01/11 09:40:18 sb 1.19.34.2: RESYNC: (1.19-1.20); FILE MERGED
2005/12/19 09:23:48 sb 1.19.34.1: #i55733# Avoid consecutive :s in LD_LIBRARY_PATH etc; patch supplied by pmladek.
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 1577da81418e..9a3f7127961f 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -5,9 +5,9 @@ # # $RCSfile: soffice.sh,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: obo $ $Date: 2005-12-21 18:08:29 $ +# last change: $Author: hr $ $Date: 2006-01-24 16:46:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -81,9 +81,9 @@ fi # set search path for shared libraries sd_platform=`uname -s` -moz_lib= +add_moz_lib= for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do - test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break; + test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break; done case $sd_platform in AIX) @@ -91,9 +91,9 @@ case $sd_platform in if [ $LIBPATH ]; then SYSTEM_LIBPATH=$LIBPATH export SYSTEM_LIBPATH - LIBPATH="$sd_prog:$moz_lib":$LIBPATH + LIBPATH="$sd_prog$add_moz_lib":$LIBPATH else - LIBPATH="$sd_prog:$moz_lib" + LIBPATH="$sd_prog$add_moz_lib" fi export LIBPATH ;; @@ -103,9 +103,9 @@ case $sd_platform in if [ $DYLD_LIBRARY_PATH ]; then SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH export SYSTEM_DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH + DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH else - DYLD_LIBRARY_PATH="$sd_prog:$moz_lib" + DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib" fi export DYLD_LIBRARY_PATH ;; @@ -115,9 +115,9 @@ case $sd_platform in if [ $SHLIB_PATH ]; then SYSTEM_SHLIB_PATH=$SHLIB_PATH export SYSTEM_SHLIB_PATH - SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH + SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH else - SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib + SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib fi export SHLIB_PATH ;; @@ -127,9 +127,9 @@ case $sd_platform in if [ $LD_LIBRARYN32_PATH ]; then SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH export SYSTEM_LD_LIBRARYN32_PATH - LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH + LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH else - LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib" + LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib" fi export LD_LIBRARYN32_PATH ;; @@ -139,9 +139,9 @@ case $sd_platform in if [ $LD_LIBRARY_PATH ]; then SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export SYSTEM_LD_LIBRARY_PATH - LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH + LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH else - LD_LIBRARY_PATH="$sd_prog:$moz_lib" + LD_LIBRARY_PATH="$sd_prog$add_moz_lib" fi export LD_LIBRARY_PATH ;; |