From 994d4d019cb568be738b3f907538354eb88ea806 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 7 Feb 2012 18:07:16 +0000 Subject: [PATCH] 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 --- contrib/scripts/live_ast | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/scripts/live_ast b/contrib/scripts/live_ast index 2bcb2f7586..3ee6e02c1d 100755 --- a/contrib/scripts/live_ast +++ b/contrib/scripts/live_ast @@ -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 }