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

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Apr 29 23:52:06 2010
New Revision: 260279

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260279
Log:
Another change for ./configure.

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=260279&r1=260278&r2=260279
==============================================================================
--- team/pabelanger/issue17165/contrib/scripts/live_ast (original)
+++ team/pabelanger/issue17165/contrib/scripts/live_ast Thu Apr 29 23:52:06 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,6 +109,8 @@
 DISABLED_MODS="chan_h323 pbx_dundi"
 DISABLED_MODS_FILE="modules-disabled.conf"
 
+LIVE_AST_CONFIGURE_PARAMS="$LIVE_AST_CONFIGURE_PARAMS --prefix=$BASE_DIR/usr --localstatedir=$BASE_DIR/var --sysconfdir=$BASE_DIR/etc"
+
 if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi
 
 if [ "$LIVE_AST_LIBPRI_PATH" != '' ]; then
@@ -174,7 +170,7 @@
 
 case "$command" in
 configure)
-  ./configure --prefix=$BASE_DIR --exec-prefix=\${prefix}/usr $LIVE_AST_CONFIGURE_PARAMS "$@"
+  ./configure $LIVE_AST_CONFIGURE_PARAMS "$@"
   if [ "$LIVE_AST_FORCE_DEF_CONF" != '' ]; then
     rm -f menuselect.makeopts
   fi