Index: scripts/soffice.sh =================================================================== RCS file: /cvs/framework/desktop/scripts/soffice.sh,v retrieving revision 1.22 retrieving revision 1.21.30.2 diff -u -r1.22 -r1.21.30.2 --- scripts/soffice.sh 9 Feb 2006 17:07:48 -0000 1.22 +++ scripts/soffice.sh 20 Feb 2006 17:39:15 -0000 1.21.30.2 @@ -47,9 +47,10 @@ # 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 @@ 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; Index: scripts/soffice_lean.sh =================================================================== RCS file: /cvs/framework/desktop/scripts/soffice_lean.sh,v retrieving revision 1.4 retrieving revision 1.4.78.1 diff -u -r1.4 -r1.4.78.1 --- scripts/soffice_lean.sh 11 Nov 2005 12:28:58 -0000 1.4 +++ scripts/soffice_lean.sh 17 Feb 2006 07:10:19 -0000 1.4.78.1 @@ -43,8 +43,10 @@ SAL_ENABLE_FILE_LOCKING=1 export SAL_ENABLE_FILE_LOCKING +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 @@ -80,7 +82,6 @@ fi # set search path for shared libraries -sd_platform=`uname -s` case $sd_platform in AIX) # this is a temporary hack until we can live with the default search paths