#i10000# changes from OOO330 m10

7 files changed, 14 insertions, 13 deletions

diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index e8faa516a852..a9a502c7f6af 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -51,12 +51,12 @@ if [ -x $checkdll ]; then
     shift  # remove the trailing ---
 
     case `uname -s` in
-    Darwin) case "${DYLD_LIBRARY_PATH+X}" in
+    Darwin) case "${DYLD_LIBRARY_PATH:+X}" in
         X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
         *) DYLD_LIBRARY_PATH=$libpath;;
         esac
         export DYLD_LIBRARY_PATH;;
-    *)  case "${LD_LIBRARY_PATH+X}" in
+    *)  case "${LD_LIBRARY_PATH:+X}" in
         X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
         *) LD_LIBRARY_PATH=$libpath;;
         esac
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
index 9b898c9d5950..fb2f65cbe01d 100755
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@@ -5,9 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/localize b/solenv/bin/localize
index e14b149226b5..ef5550e72e67 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -7,9 +7,9 @@ fi
 # localize.pl calls localize_sl in solver bin directory which depends on dynamic
 # libraries in solver lib directory but has no correct RPATH (or equivalent):
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
index df8205cf6d22..af7f8351406c 100755
--- a/solenv/bin/localize_sl
+++ b/solenv/bin/localize_sl
@@ -5,9 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1a285ddaa3e6..f4234a9c5d89 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -35,15 +35,15 @@
 set -e
 if [ "$OUTPATH" = "unxlngi6" ]
 then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
     ${BUILD_TOOLS?}/rpmbuild "$@"
 else
 if [ "$OUTPATH" = "unxlngx6" ]
 then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
     ${BUILD_TOOLS?}/rpmbuild "$@"
 else
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
     ${BUILD_TOOLS?}/rpm "$@"
 fi
 fi
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
index 1aa34f2a4a45..86f8a3e269fd 100755
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -28,5 +28,5 @@
 LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
 # echo $(dirname $LIBRPMBUILD)
 LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
-# LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
 # ${BUILD_TOOLS?}/rpm "$@"
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 77413849c5f9..f16ccb554fc5 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-
 # Default ISO code used when no languages specified
 # This language will be always included!
 defaultlangiso=en-US
@@ -118,6 +117,7 @@ sa-IN \
 si \
 sc \
 sd \
+sq \
 sk \
 sl \
 sh \
@@ -129,6 +129,7 @@ sw \
 sw-TZ \
 te-IN \
 ti-ER \
+ta \
 ta-IN \
 th \
 tn \