Index: oounix/office/scripts/soffice.sh =================================================================== RCS file: /cvs/gsl/sysui/oounix/office/scripts/soffice.sh,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 soffice.sh --- oounix/office/scripts/soffice.sh 1 Apr 2002 19:56:18 -0000 1.1.2.1 +++ oounix/office/scripts/soffice.sh 25 Sep 2002 21:48:32 -0000 @@ -82,6 +82,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; FreeBSD) test=/bin/test ;; + Darwin) test=/bin/test ;; *) test=/usr/bin/test ;; esac @@ -162,6 +163,11 @@ export LD_LIBRARY_PATH ;; + Darwin) + DYLD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$DYLD_LIBRARY_PATH + export DYLD_LIBRARY_PATH + ;; + *) LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH export LD_LIBRARY_PATH @@ -246,6 +252,14 @@ # set path so that other apps can be started from soffice just by name PATH="$sd_prog":$PATH export PATH + +# HACK: on Mac OS X 10.1, we need to cd to the same directory as the executable +# that we will execute to squelch all of those annoying "*** malloc" warnings +if [ "$sd_platform" = "Darwin" ]; then + case `uname -r` in + [1-5].*) cd "$sd_prog";; + esac +fi # execute soffice binary # there is a bug in solaris sh that prevents the use of "$@"