diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 18:31:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 18:31:01 +0000 |
| commit | 50405c33464457dff5352d875ef1c92d1c9c3a6e (patch) | |
| tree | 924603bcb9689fc2a82765ac52fce17dc4a632b7 | |
| parent | 1af939fba0a133709f0396084f5663beb0b761f0 (diff) | |
INTEGRATION: CWS geordi2q11 (1.8.96); FILE MERGED
2003/12/16 11:13:41 hr 1.8.96.1: #111934#: join CWS ooo111fix1
| -rw-r--r-- | desktop/scripts/soffice.sh | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 78762f077e0b..53759d6bb767 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -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 |