diff options
-rwxr-xr-x | solenv/bin/localize | 4 | ||||
-rwxr-xr-x | solenv/bin/localize_sl | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/solenv/bin/localize b/solenv/bin/localize index 74a75ecc3aee..e14b149226b5 100755 --- a/solenv/bin/localize +++ b/solenv/bin/localize @@ -12,9 +12,9 @@ else export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT} fi -if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx ]; then +if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@" else - exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@" + exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@" fi diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl new file mode 100755 index 000000000000..df8205cf6d22 --- /dev/null +++ b/solenv/bin/localize_sl @@ -0,0 +1,18 @@ +#!/bin/sh +if [ x${SOLARENV}x = xx ]; then + echo No environment found, please use 'setsolar' +exit 1 +fi + +if [ "${OS?}" = MACOSX ]; then + 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} +fi + +if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then + exec $SOLARVERSION/$INPATH/bin/localize_sl "$@" +else + exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@" +fi + |