diff options
| -rwxr-xr-x | solenv/bin/checkdll.sh | 4 | ||||
| -rwxr-xr-x | solenv/bin/gsicheck | 4 | ||||
| -rwxr-xr-x | solenv/bin/localize | 4 | ||||
| -rwxr-xr-x | solenv/bin/localize_sl | 4 | ||||
| -rwxr-xr-x | solenv/bin/rpm-wrapper | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | solenv/bin/soirpm.sh | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh index f1aae467a..c8361983a 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 9b898c9d5..fb2f65cbe 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 e14b14922..ef5550e72 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 df8205cf6..af7f83514 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 1a285ddaa..f4234a9c5 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 6c7595d34..f984bbec1 100755..100644 --- 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 "$@" |