diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 14:04:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 14:04:16 +0000 |
| commit | 913b5ec88e4082da1592728cf2814fb35623f623 (patch) | |
| tree | afb2045f9c10b0f2fcd62c90ccf8aa58825fc879 /desktop/scripts | |
| parent | 0f7d03f4673c201c3dd3c4ffd51feea80e8ba791 (diff) | |
INTEGRATION: CWS mh23 (1.26.92); FILE MERGED
2007/07/17 15:11:54 mh 1.26.92.1: don't add system path to LD_LIBRARY_PATH, #i76122#
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index c7719b243bc2..a5c08d5b86a4 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -5,9 +5,9 @@ # # $RCSfile: soffice.sh,v $ # -# $Revision: 1.26 $ +# $Revision: 1.27 $ # -# last change: $Author: obo $ $Date: 2007-03-07 13:14:15 $ +# last change: $Author: obo $ $Date: 2007-07-18 15:04:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -87,8 +87,23 @@ fi # set search path for shared libraries 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 && add_moz_lib=":$moz_lib_path" && break; +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 + if [ -f $moz_lib_path/libnss3.so ]; then + case "$moz_lib_path" in + /usr/lib|/usr/lib64) : ;; + *) add_moz_lib=":$moz_lib_path" + esac + break + fi done case $sd_platform in AIX) |