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

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed May  5 09:48:26 2010
New Revision: 261228

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261228
Log:
Revert --prefix changes, once again.

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=261228&r1=261227&r2=261228
==============================================================================
--- team/pabelanger/issue17165/contrib/scripts/live_ast (original)
+++ team/pabelanger/issue17165/contrib/scripts/live_ast Wed May  5 09:48:26 2010
@@ -109,7 +109,12 @@
 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"
+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"
+}
 
 if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi
 
@@ -182,13 +187,11 @@
   fi
   ;;
 install)
-  make install "$@"
-  ;;
-testsuite)
-  make install samples "$@"
+  make install DESTDIR="$BASE_DIR" "$@"
   ;;
 samples)
-  make samples "$@"
+  make samples DESTDIR="$BASE_DIR" "$@"
+  update_conf
   # 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"