strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS geordi2q11 (1.8.96); FILE MERGED

Browse source 
2003/12/16 11:13:41 hr 1.8.96.1: #111934#: join CWS ooo111fix1
This commit is contained in:
Vladimir Glazounov 2003-12-17 18:31:01 +00:00
parent 1af939fba0
commit 50405c3346
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
desktop/scripts/soffice.sh
View file

@ -144,25 +144,27 @@ case $sd_platform in
esac
# extend the ld_library_path for java: javaldx checks the sofficerc for us
java_ld_library_path=`"$sd_prog/javaldx"`
if [ "$java_ld_library_path" != "" ] ; then
case $sd_platform in
AIX)
LIBPATH=${java_ld_library_path}:${LIBPATH}
;;
Darwin)
DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
;;
HP-UX)
SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
;;
IRIX*)
LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
;;
*)
LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
;;
esac
if [ -x "$sd_prog/javaldx" ] ; then
java_ld_library_path=`"$sd_prog/javaldx"`
if [ "$java_ld_library_path" != "" ] ; then
case $sd_platform in
AIX)
LIBPATH=${java_ld_library_path}:${LIBPATH}
;;
Darwin)
DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
;;
HP-UX)
SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
;;
IRIX*)
LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
;;
*)
LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
;;
esac
fi
fi
# set java environment variables
@ -227,7 +229,7 @@ for sd_arg in ${1+"$@"} ; do
done
sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
${sd_prog}/pagein -L${sd_prog} ${sd_pagein_args}
"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
# set path so that other apps can be started from soffice just by name
PATH="$sd_prog":$PATH