From 913b5ec88e4082da1592728cf2814fb35623f623 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 18 Jul 2007 14:04:16 +0000
Subject: 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#

---
 desktop/scripts/soffice.sh | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'desktop/scripts/soffice.sh')

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)
-- 
cgit