Index: contrib/scripts/live_ast
===================================================================
--- contrib/scripts/live_ast	(revision 256744)
+++ contrib/scripts/live_ast	(working copy)
@@ -115,6 +115,13 @@
 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"
+}
+
 if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi
 
 if [ "$LIVE_AST_LIBPRI_PATH" != '' ]; then
@@ -188,19 +195,19 @@
 install)
   make install DESTDIR="$BASE_DIR" "$@"
   ;;
+testsuite)
+  make install samples DESTDIR="$BASE_DIR" "$@"
+  update_conf
+  ;;
 samples)
   make samples DESTDIR="$BASE_DIR" "$@"
-  sed -r -i \
-    -e '/^\[directories\]\(!\)/s/\(!\).*//' \
-    -e "/^\[directories\]/a; rem-out any of the following to use Asterisk's defaults:" \
-    -e "/^ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir\>/s| /| $BASE_DIR/|" \
-    "$AST_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
+  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
   # 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"
@@ -244,6 +251,7 @@
   echo "$0 run [params]         asterisk [params]"
   echo "$0 gdb                  gdb asterisk"
   echo "$0 conf-file            create live.conf if it does exist"
+  echo "$0 testsuite            Asterisk testsuite install" 
   exit 1
   ;;
 esac