diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-18 08:04:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-18 08:04:38 +0000 |
| commit | fc5a77f10ccd532fddeecf5f1e916eec16c2dcfd (patch) | |
| tree | 62677c143efb6e3ae290398a49671cf1e2b5f759 /desktop | |
| parent | 498f5e1b1ddd3ed6369fc5b7d114fa69d54c2953 (diff) | |
INTEGRATION: CWS nativefixer1 (1.11.76); FILE MERGED
2004/11/03 09:24:37 obr 1.11.76.1: #i36463# patch applied
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/soffice.sh | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index f52f56ed454e..21d7ff4996b9 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -102,8 +102,10 @@ case $sd_platform in if [ $LIBPATH ]; then SYSTEM_LIBPATH=$LIBPATH export SYSTEM_LIBPATH + LIBPATH="$sd_prog":$LIBPATH + else + LIBPATH="$sd_prog" fi - LIBPATH="$sd_prog":$LIBPATH export LIBPATH ;; @@ -112,8 +114,10 @@ case $sd_platform in if [ $DYLD_LIBRARY_PATH ]; then SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH export SYSTEM_DYLD_LIBRARY_PATH + DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH + else + DYLD_LIBRARY_PATH="$sd_prog" fi - DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH ;; @@ -122,8 +126,10 @@ case $sd_platform in if [ $SHLIB_PATH ]; then SYSTEM_SHLIB_PATH=$SHLIB_PATH export SYSTEM_SHLIB_PATH + SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH + else + SHLIB_PATH="$sd_prog":/usr/openwin/lib fi - SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH export SHLIB_PATH ;; @@ -132,8 +138,10 @@ case $sd_platform in if [ $LD_LIBRARYN32_PATH ]; then SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH export SYSTEM_LD_LIBRARYN32_PATH + LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH + else + LD_LIBRARYN32_PATH=:"$sd_prog" fi - LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH export LD_LIBRARYN32_PATH ;; @@ -142,8 +150,10 @@ case $sd_platform in if [ $LD_LIBRARY_PATH ]; then SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export SYSTEM_LD_LIBRARY_PATH + LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH + else + LD_LIBRARY_PATH="$sd_prog" fi - LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH export LD_LIBRARY_PATH ;; esac @@ -214,7 +224,11 @@ sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" "${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 +if [ $PATH ]; then + PATH="$sd_prog":$PATH +else + PATH="$sd_prog" +fi export PATH # execute soffice binary |