View | Details | Raw Unified | Return to issue 7847
Collapse All | Expand All

(-)oounix/office/scripts/soffice.sh (+14 lines)
Lines 82-87 Link Here
82
case $sd_platform in
82
case $sd_platform in
83
	SCO_SV) test=/bin/test     ;;
83
	SCO_SV) test=/bin/test     ;;
84
	FreeBSD) test=/bin/test     ;;
84
	FreeBSD) test=/bin/test     ;;
85
	Darwin) test=/bin/test     ;;
85
  	*)      test=/usr/bin/test ;;
86
  	*)      test=/usr/bin/test ;;
86
esac
87
esac
87
88
Lines 162-167 Link Here
162
    export LD_LIBRARY_PATH
163
    export LD_LIBRARY_PATH
163
    ;;
164
    ;;
164
165
166
  Darwin)
167
    DYLD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$DYLD_LIBRARY_PATH
168
    export DYLD_LIBRARY_PATH
169
    ;;
170
165
  *)
171
  *)
166
    LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
172
    LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
167
    export LD_LIBRARY_PATH
173
    export LD_LIBRARY_PATH
Lines 246-251 Link Here
246
# set path so that other apps can be started from soffice just by name
252
# set path so that other apps can be started from soffice just by name
247
PATH="$sd_prog":$PATH
253
PATH="$sd_prog":$PATH
248
export PATH
254
export PATH
255
256
# HACK: on Mac OS X 10.1, we need to cd to the same directory as the executable
257
# that we will execute to squelch all of those annoying "*** malloc" warnings
258
if [ "$sd_platform" = "Darwin" ]; then
259
	case `uname -r` in
260
		[1-5].*) cd "$sd_prog";;
261
	esac
262
fi
249
263
250
# execute soffice binary
264
# execute soffice binary
251
# there is a bug in solaris sh that prevents the use of "$@"
265
# there is a bug in solaris sh that prevents the use of "$@"

Return to issue 7847