diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:46:34 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:46:34 +0000 |
commit | 84e28c15b333f3077b630ac53f9b805d277a3cd1 (patch) | |
tree | b51efb80f0a3a516835d9cf5e2a5e6b0430b5c32 /desktop | |
parent | 6d8c754ad6c8fa7a47b129e2f094264288e4ce8d (diff) |
INTEGRATION: CWS sb42 (1.4.34); FILE MERGED
2005/12/19 09:23:00 sb 1.4.34.1: #i55733# Avoid final : in LD_LIBRARY_PATH etc.
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/scripts/unopkg.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 88bf3a7d6a6e..a894c187d34b 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -5,9 +5,9 @@ # # $RCSfile: unopkg.sh,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-11-11 12:29:10 $ +# last change: $Author: hr $ $Date: 2006-01-24 16:46:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,27 +70,27 @@ fi sd_platform=`uname -s` case $sd_platform in AIX) - LIBPATH="$sd_prog":$LIBPATH + LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}} export LIBPATH ;; Darwin) - DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH + DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH+:${DYLD_LIBRARY_PATH}} export DYLD_LIBRARY_PATH ;; HP-UX) - SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH + SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} export SHLIB_PATH ;; IRIX*) - LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH + LD_LIBRARYN32_PATH=${sd_prog}${LD_LIBRARYN32_PATH+:${LD_LIBRARYN32_PATH}} export LD_LIBRARYN32_PATH ;; *) - LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH + LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH ;; esac |