diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:25 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:25 +0200 |
| commit | 8e3b6ac3249200da87d1bd4b7ef0c7e51b706dd6 (patch) | |
| tree | 12bb0706707688f2e6143e0b8be08b46db382c66 /padmin | |
| parent | e10b5bef6746338777cb350a87cf7aa5890c4809 (diff) | |
| parent | 23207a4338732e755039eb7b627acdb566960e05 (diff) | |
Merge commit 'ooo/OOO330_m10'
Conflicts:
vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/spadmin.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh index 31ab4382fe52..c831ab7f0919 100644 --- a/padmin/source/spadmin.sh +++ b/padmin/source/spadmin.sh @@ -57,7 +57,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH fi fi |