[svn-commits] pabelanger: branch pabelanger/issue17165 r257639 - /team/pabelanger/issue1716...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Apr 15 18:25:23 2010
New Revision: 257639

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257639
Log:
Logic change.  Use --prefix over DESTDIR; now we don't have to update asterisk.conf

Modified:
    team/pabelanger/issue17165/contrib/scripts/live_ast

Modified: team/pabelanger/issue17165/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17165/contrib/scripts/live_ast?view=diff&rev=257639&r1=257638&r2=257639
==============================================================================
--- team/pabelanger/issue17165/contrib/scripts/live_ast (original)
+++ team/pabelanger/issue17165/contrib/scripts/live_ast Thu Apr 15 18:25:23 2010
@@ -98,12 +98,6 @@
 # live_ast will edit makeopts to use that second copy after ./configure
 # is run.
 #LIVE_AST_BRISTUFFED_LIBPRI=yes
-#
-# LIVE_AST_FOR_SYSTEM
-# When generating asterisk.conf, use most components from the installed 
-# system. Also provide a sane var-run directory for those of us who want 
-# to do the right thing and run asterisk as non-root.
-#LIVE_AST_FOR_SYSTEM=yes
 ####################### End Samples
 
 BASE_DIR="$PWD/live"
@@ -115,12 +109,7 @@
 DISABLED_MODS="chan_h323 pbx_dundi"
 DISABLED_MODS_FILE="modules-disabled.conf"
 
-update_conf() {
-  sed -r -s \
-    -e "/^;ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir\>/s| /| $BASE_DIR/|" \
-    -e "s/^;ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir/ast\1dir/" \
-    "$AST_CONF" > "$AST_CONF".tmp && mv "$AST_CONF".tmp "$AST_CONF"
-}
+LIVE_AST_CONFIGURE_PARAMS="$LIVE_AST_CONFIGURE_PARAMS --prefix=$BASE_DIR"
 
 if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi
 
@@ -193,21 +182,13 @@
   fi
   ;;
 install)
-  make install DESTDIR="$BASE_DIR" "$@"
+  make install "$@"
   ;;
 testsuite)
-  make install samples DESTDIR="$BASE_DIR" "$@"
-  update_conf
+  make install samples "$@"
   ;;
 samples)
-  make samples DESTDIR="$BASE_DIR" "$@"
-  update_conf
-#  if [ "$LIVE_AST_FOR_SYSTEM" != '' ]; then
-#    sed -r -i \
-#      -e "/^ast(etc|varlib|data|agi|run|spool|log|db|key)dir\>/s|^|;|" \
-#      -e "/^;astrundir\>/aastrundir    => /var/run/asterisk" \
-#      "$AST_CONF"
-#  fi
+  make samples "$@"
   # disable some modules that bind on a port that is already in use by a
   # main Asterisk copy, and would crash asterisk in failing:
   rm -f "$AST_CONF_DIR/$DISABLED_MODS_FILE"