Continuation of last patch - since LIVE_AST_LD_PATH_EXTRA will now never

be empty, don't check for it, instead of check if LD_LIBRARY_PATH is
already set and if so, append LIVE_AST_LD_PATH_EXTRA properly.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2012-02-07 18:07:16 +00:00
parent 8e79e31aa5
commit 994d4d019c

View File

@@ -157,9 +157,12 @@ LIVE_AST_LD_PATH_EXTRA=`echo $LIVE_AST_LD_PATH_EXTRA | tr ' ' :`
LIVE_AST_LD_PATH_EXTRA="$BASE_DIR/usr/lib:$LIVE_AST_LD_PATH_EXTRA"
set_ld_env() {
if [ "$LIVE_AST_LD_PATH_EXTRA$LD_LIBRARY_PATH" = '' ]; then return; fi
LD_LIBRARY_PATH=`echo $LIVE_AST_LD_PATH_EXTRA $LD_LIBRARY_PATH | tr ' ' :`
if [ "$LD_LIBRARY_PATH" = '' ]; then
LD_LIBRARY_PATH="$LIVE_AST_LD_PATH_EXTRA"
else
LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | tr ' ' :`
LD_LIBRARY_PATH="$LIVE_AST_LD_PATH_EXTRA:$LD_LIBRARY_PATH"
fi
export LD_LIBRARY_PATH
}