diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 13:17:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 13:17:45 +0000 |
| commit | 58d04575732992f0ac6a13401a8f41a2917586d0 (patch) | |
| tree | bd7ca21f665eb3a768adb67b6c58eaba9f197b4b /desktop/scripts | |
| parent | a91e4f1008d13be9d1fb136515046f623f260d49 (diff) | |
INTEGRATION: CWS pj50 (1.21.30); FILE MERGED
2006/02/20 17:39:15 pjanik 1.21.30.2: RESYNC: (1.21-1.22); FILE MERGED
2006/02/17 07:10:01 pjanik 1.21.30.1: #i61961#: save one uname execution for all unx systems
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 6fea3a942bd0..cafdde43f6e2 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -5,9 +5,9 @@ # # $RCSfile: soffice.sh,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: rt $ $Date: 2006-02-09 17:07:48 $ +# last change: $Author: rt $ $Date: 2006-03-08 14:17:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,9 +47,10 @@ export SAL_ENABLE_FILE_LOCKING # working on your system. # export SAL_NOOPENGL=true; +sd_platform=`uname -s` # the following test is needed on Linux PPC with IBM j2sdk142 -if [ `uname -s` = "Linux" -a "`uname -m`" = "ppc" ] ; then +if [ $sd_platform = "Linux" -a "`uname -m`" = "ppc" ] ; then JITC_PROCESSOR_TYPE=6 export JITC_PROCESSOR_TYPE fi @@ -85,7 +86,6 @@ if [ -x "$sd_prog/sopatchlevel.sh" ]; then fi # set search path for shared libraries -sd_platform=`uname -s` 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; |