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

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Apr 29 22:43:18 2010
New Revision: 260278

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260278
Log:
Ok, this time set both --prefix and --exec-prefix.

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=260278&r1=260277&r2=260278
==============================================================================
--- team/pabelanger/issue17165/contrib/scripts/live_ast (original)
+++ team/pabelanger/issue17165/contrib/scripts/live_ast Thu Apr 29 22:43:18 2010
@@ -115,13 +115,6 @@
 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
@@ -181,7 +174,7 @@
 
 case "$command" in
 configure)
-  ./configure --prefix=$BASE_DIR $LIVE_AST_CONFIGURE_PARAMS "$@"
+  ./configure --prefix=$BASE_DIR --exec-prefix=\${prefix}/usr $LIVE_AST_CONFIGURE_PARAMS "$@"
   if [ "$LIVE_AST_FORCE_DEF_CONF" != '' ]; then
     rm -f menuselect.makeopts
   fi
@@ -193,21 +186,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"