[asterisk-commits] russell: branch russell/chan_console r49077 - in /team/russell/chan_console: ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sat Dec 30 23:08:21 MST 2006


Author: russell
Date: Sun Dec 31 00:08:20 2006
New Revision: 49077

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49077
Log:
Merged revisions 49062,49064-49065,49067-49069,49071-49072,49074-49076 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r49062 | murf | 2006-12-29 19:51:07 -0500 (Fri, 29 Dec 2006) | 9 lines

Merged revisions 49061 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49061 | murf | 2006-12-29 17:40:37 -0700 (Fri, 29 Dec 2006) | 1 line

A fix for 8661, where the CUT func needed to have comma args converted to vertical bars. I hope this change does little harm.
........

................
r49064 | file | 2006-12-29 22:40:42 -0500 (Fri, 29 Dec 2006) | 10 lines

Merged revisions 49063 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49063 | file | 2006-12-29 22:37:22 -0500 (Fri, 29 Dec 2006) | 2 lines

Initialize the packet queue in load_module instead of just declaring the list with the default value. (issue #8695 reported by ssokol)

........

................
r49065 | file | 2006-12-29 22:42:20 -0500 (Fri, 29 Dec 2006) | 2 lines

Initialize obj pointers to NULL. Gets rid of two compiler warnings.

................
r49067 | file | 2006-12-30 00:49:17 -0500 (Sat, 30 Dec 2006) | 10 lines

Merged revisions 49066 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49066 | file | 2006-12-30 00:46:57 -0500 (Sat, 30 Dec 2006) | 2 lines

If the Packet2Packet bridge is being broken because of a masquerade then attempt to read a frame in so the masquerade actually happens. Otherwise weirdness will occur. (issue #8696 reported by kjotte)

........

................
r49068 | kpfleming | 2006-12-30 08:26:43 -0500 (Sat, 30 Dec 2006) | 2 lines

small formatting fix

................
r49069 | kpfleming | 2006-12-30 08:27:38 -0500 (Sat, 30 Dec 2006) | 2 lines

now that the 'languageprefix' option defaults to 'on', and all channels have a default language of 'en', let's install the English sound files into /var/lib/asterisk/sounds/en, just like the other languages

................
r49071 | file | 2006-12-30 13:22:54 -0500 (Sat, 30 Dec 2006) | 9 lines

Blocked revisions 49070 via svnmerge

........
r49070 | file | 2006-12-30 13:19:57 -0500 (Sat, 30 Dec 2006) | 2 lines

Use asprintf to build the channel names instead of custom function. I believe the custom function is doing some things that are not portable across all implementations. (issue #8570 reported by hterag & issue #8692 reported by nicolasg)

........

................
r49072 | file | 2006-12-30 13:27:13 -0500 (Sat, 30 Dec 2006) | 2 lines

Clarify why we are reading in a frame in the Packet2Packet bridge.

................
r49074 | file | 2006-12-30 13:32:31 -0500 (Sat, 30 Dec 2006) | 10 lines

Merged revisions 49073 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49073 | file | 2006-12-30 13:31:17 -0500 (Sat, 30 Dec 2006) | 2 lines

IAX has been deprecated for quite some time so we had better use IAX2 when creating the dial string for users. (issue #8697 reported by ssokol)

........

................
r49075 | tilghman | 2006-12-30 23:54:20 -0500 (Sat, 30 Dec 2006) | 5 lines

1. Rename 'maxmessage' to 'maxsecs' to differentiate from 'maxmsg'.
2. Rename 'minmessage' to 'minsecs' for parity.
3. Make 'maxsecs' a per-user option, in addition to global.
(Issue # 8624)

................
r49076 | tilghman | 2006-12-31 00:20:18 -0500 (Sun, 31 Dec 2006) | 2 lines

Add power and right/left shift functions (Issue 7959)

................

Modified:
    team/russell/chan_console/   (props changed)
    team/russell/chan_console/UPGRADE.txt
    team/russell/chan_console/apps/app_voicemail.c
    team/russell/chan_console/channels/chan_iax2.c
    team/russell/chan_console/configs/voicemail.conf.sample
    team/russell/chan_console/funcs/func_math.c
    team/russell/chan_console/funcs/func_odbc.c
    team/russell/chan_console/main/channel.c
    team/russell/chan_console/main/rtp.c
    team/russell/chan_console/pbx/pbx_ael.c
    team/russell/chan_console/pbx/pbx_config.c
    team/russell/chan_console/sounds/Makefile

Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec 31 00:08:20 2006
@@ -1,1 +1,1 @@
-/trunk:1-49057
+/trunk:1-49076

Modified: team/russell/chan_console/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/UPGRADE.txt?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/UPGRADE.txt (original)
+++ team/russell/chan_console/UPGRADE.txt Sun Dec 31 00:08:20 2006
@@ -23,3 +23,11 @@
   the default sound file layout for non-English sounds is the 'new
   style' layout introduced in Asterisk 1.4 (and used by the automatic
   sound file installer in the Makefile).
+
+Applications:
+
+* The voicemail configuration values 'maxmessage' and 'minmessage' have
+  been changed to 'maxsecs' and 'minsecs' to clarify their purpose and
+  to make them more distinguishable from 'maxmsgs', which sets folder
+  size.  The old variables will continue to work in this version, albeit
+  with a deprecation warning.

Modified: team/russell/chan_console/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/apps/app_voicemail.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/apps/app_voicemail.c (original)
+++ team/russell/chan_console/apps/app_voicemail.c Sun Dec 31 00:08:20 2006
@@ -312,6 +312,7 @@
 	unsigned int flags;              /*!< VM_ flags */	
 	int saydurationm;
 	int maxmsg;                      /*!< Maximum number of msgs per folder for this mailbox */
+	int maxsecs;                     /*!< Maximum number of seconds per message for this mailbox */
 #ifdef IMAP_STORAGE
 	char imapuser[80];	/* IMAP server login */
 	char imappassword[80];	/* IMAP server password if authpassword not defined */
@@ -511,8 +512,8 @@
 static struct ast_smdi_interface *smdi_iface = NULL;
 static char vmfmts[80];
 static double volgain;
-static int vmminmessage;
-static int vmmaxmessage;
+static int vmminsecs;
+static int vmmaxsecs;
 static int maxgreet;
 static int skipms;
 static int maxlogins;
@@ -561,6 +562,8 @@
 		ast_copy_string(vmu->dialout, dialcontext, sizeof(vmu->dialout));
 	if (exitcontext)
 		ast_copy_string(vmu->exit, exitcontext, sizeof(vmu->exit));
+	if (vmmaxsecs)
+		vmu->maxsecs = vmmaxsecs;
 	if (maxmsg)
 		vmu->maxmsg = maxmsg;
 	vmu->volgain = volgain;
@@ -617,6 +620,13 @@
 		ast_copy_string(vmu->dialout, value, sizeof(vmu->dialout));
 	} else if (!strcasecmp(var, "exitcontext")) {
 		ast_copy_string(vmu->exit, value, sizeof(vmu->exit));
+	} else if (!strcasecmp(var, "maxmessage")) {
+		if (vmu->maxsecs <= 0) {
+			ast_log(LOG_WARNING, "Invalid max message length of %s. Using global value %i\n", value, vmmaxsecs);
+			vmu->maxsecs = vmmaxsecs;
+		} else {
+			vmu->maxsecs = atoi(value);
+		}
 	} else if (!strcasecmp(var, "maxmsg")) {
 		vmu->maxmsg = atoi(value);
 		if (vmu->maxmsg <= 0) {
@@ -668,6 +678,7 @@
 	struct ast_variable *tmp;
 	tmp = var;
 	while (tmp) {
+		ast_log(LOG_DEBUG, "Name: %s Value: %s\n", tmp->name, tmp->value);
 		if (!strcasecmp(tmp->name, "password")) {
 			ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
 		} else if (!strcasecmp(tmp->name, "uniqueid")) {
@@ -3086,15 +3097,15 @@
 		} else
 			ast_log(LOG_WARNING, "Error opening text file for output\n");
 #ifdef IMAP_STORAGE
-		res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain, vms);
+		res = play_record_review(chan, NULL, tmptxtfile, vmu->maxsecs, fmt, 1, vmu, &duration, NULL, options->record_gain, vms);
 #else
-		res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain, NULL);
+		res = play_record_review(chan, NULL, tmptxtfile, vmu->maxsecs, fmt, 1, vmu, &duration, NULL, options->record_gain, NULL);
 #endif
 
 		if (txt) {
-			if (duration < vmminmessage) {
+			if (duration < vmminsecs) {
 				if (option_verbose > 2) 
-					ast_verbose( VERBOSE_PREFIX_3 "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, vmminmessage);
+					ast_verbose( VERBOSE_PREFIX_3 "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, vmminsecs);
 				ast_filedelete(tmptxtfile, NULL);
 				unlink(tmptxtfile);
 			} else {
@@ -3157,7 +3168,7 @@
 		} else if (res > 0)
 			res = 0;
 
-		if (duration < vmminmessage)
+		if (duration < vmminsecs)
 			/* XXX We should really give a prompt too short/option start again, with leave_vm_out called only after a timeout XXX */
 			pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
 		else
@@ -7271,25 +7282,50 @@
 			astemail = ASTERISK_USERNAME;
 		ast_copy_string(serveremail, astemail, sizeof(serveremail));
 		
-		vmmaxmessage = 0;
-		if ((s = ast_variable_retrieve(cfg, "general", "maxmessage"))) {
+		vmmaxsecs = 0;
+		if ((s = ast_variable_retrieve(cfg, "general", "maxsecs"))) {
 			if (sscanf(s, "%d", &x) == 1) {
-				vmmaxmessage = x;
+				vmmaxsecs = x;
 			} else {
 				ast_log(LOG_WARNING, "Invalid max message time length\n");
 			}
-		}
-
-		vmminmessage = 0;
-		if ((s = ast_variable_retrieve(cfg, "general", "minmessage"))) {
+		} else if ((s = ast_variable_retrieve(cfg, "general", "maxmessage"))) {
+			static int maxmessage_deprecate = 0;
+			if (maxmessage_deprecate == 0) {
+				maxmessage_deprecate = 1;
+				ast_log(LOG_WARNING, "Setting 'maxmessage' has been deprecated in favor of 'maxsecs'.\n");
+			}
 			if (sscanf(s, "%d", &x) == 1) {
-				vmminmessage = x;
-				if (maxsilence <= vmminmessage)
+				vmmaxsecs = x;
+			} else {
+				ast_log(LOG_WARNING, "Invalid max message time length\n");
+			}
+		}
+
+		vmminsecs = 0;
+		if ((s = ast_variable_retrieve(cfg, "general", "minsecs"))) {
+			if (sscanf(s, "%d", &x) == 1) {
+				vmminsecs = x;
+				if (maxsilence <= vmminsecs)
 					ast_log(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
 			} else {
 				ast_log(LOG_WARNING, "Invalid min message time length\n");
 			}
-		}
+		} else if ((s = ast_variable_retrieve(cfg, "general", "minmessage"))) {
+			static int maxmessage_deprecate = 0;
+			if (maxmessage_deprecate == 0) {
+				maxmessage_deprecate = 1;
+				ast_log(LOG_WARNING, "Setting 'minmessage' has been deprecated in favor of 'minsecs'.\n");
+			}
+			if (sscanf(s, "%d", &x) == 1) {
+				vmminsecs = x;
+				if (maxsilence <= vmminsecs)
+					ast_log(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n");
+			} else {
+				ast_log(LOG_WARNING, "Invalid min message time length\n");
+			}
+		}
+
 		fmt = ast_variable_retrieve(cfg, "general", "format");
 		if (!fmt)
 			fmt = "wav";	

Modified: team/russell/chan_console/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_iax2.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/channels/chan_iax2.c (original)
+++ team/russell/chan_console/channels/chan_iax2.c Sun Dec 31 00:08:20 2006
@@ -632,9 +632,7 @@
 static struct ast_iax2_queue {
 	AST_LIST_HEAD(, iax_frame) queue;
 	int count;
-} iaxq = {
-	.queue = AST_LIST_HEAD_INIT_VALUE
-};
+} iaxq;
 
 static AST_LIST_HEAD_STATIC(users, iax2_user);
 
@@ -9986,6 +9984,8 @@
 	AST_LIST_TRAVERSE_SAFE_END
 	AST_LIST_UNLOCK(&dynamic_list);
 
+	AST_LIST_HEAD_DESTROY(&iaxq.queue);
+
 	ast_netsock_release(netsock);
 	for (x=0;x<IAX_MAX_CALLS;x++)
 		if (iaxs[x])
@@ -10059,6 +10059,8 @@
 	}
 
 	ast_netsock_init(netsock);
+
+	AST_LIST_HEAD_INIT(&iaxq.queue);
 	
 	ast_cli_register_multiple(cli_iax2, sizeof(cli_iax2) / sizeof(struct ast_cli_entry));
 

Modified: team/russell/chan_console/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/configs/voicemail.conf.sample?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/configs/voicemail.conf.sample (original)
+++ team/russell/chan_console/configs/voicemail.conf.sample Sun Dec 31 00:08:20 2006
@@ -35,10 +35,10 @@
 ; (100) is used.  Maximum value for this option is 9999.
 ;maxmsg=100
 ; Maximum length of a voicemail message in seconds
-;maxmessage=180
+;maxsecs=180
 ; Minimum length of a voicemail message in seconds for the message to be kept
 ; The default is no minimum.
-;minmessage=3
+;minsecs=3
 ; Maximum length of greetings in seconds
 ;maxgreet=60
 ; How many milliseconds to skip forward/back when rew/ff in message playback

Modified: team/russell/chan_console/funcs/func_math.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/funcs/func_math.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/funcs/func_math.c (original)
+++ team/russell/chan_console/funcs/func_math.c Sun Dec 31 00:08:20 2006
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 #include <sys/types.h>
 
 #include "asterisk/module.h"
@@ -47,6 +48,9 @@
 	MULTIPLYFUNCTION,
 	SUBTRACTFUNCTION,
 	MODULUSFUNCTION,
+	POWFUNCTION,
+	SHLEFTFUNCTION,
+	SHRIGHTFUNCTION,
 	GTFUNCTION,
 	LTFUNCTION,
 	GTEFUNCTION,
@@ -105,12 +109,18 @@
 	} else if ((op = strchr(mvalue1, '%'))) {
 		iaction = MODULUSFUNCTION;
 		*op = '\0';
+	} else if ((op = strchr(mvalue1, '^'))) {
+		iaction = POWFUNCTION;
+		*op = '\0';
 	} else if ((op = strchr(mvalue1, '>'))) {
 		iaction = GTFUNCTION;
 		*op = '\0';
 		if (*(op + 1) == '=') {
 			*++op = '\0';
 			iaction = GTEFUNCTION;
+		} else if (*(op + 1) == '>') {
+			*++op = '\0';
+			iaction = SHRIGHTFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '<'))) {
 		iaction = LTFUNCTION;
@@ -118,6 +128,9 @@
 		if (*(op + 1) == '=') {
 			*++op = '\0';
 			iaction = LTEFUNCTION;
+		} else if (*(op + 1) == '<') {
+			*++op = '\0';
+			iaction = SHLEFTFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '='))) {
 		*op = '\0';
@@ -194,6 +207,25 @@
 
 			break;
 		}
+	case POWFUNCTION:
+		ftmp = pow(fnum1, fnum2);
+		break;
+	case SHLEFTFUNCTION:
+		{
+			int inum1 = fnum1;
+			int inum2 = fnum2;
+
+			ftmp = (inum1 << inum2);
+			break;
+		}
+	case SHRIGHTFUNCTION:
+		{
+			int inum1 = fnum1;
+			int inum2 = fnum2;
+
+			ftmp = (inum1 >> inum2);
+			break;
+		}
 	case GTFUNCTION:
 		ast_copy_string(buf, (fnum1 > fnum2) ? "TRUE" : "FALSE", len);
 		break;

Modified: team/russell/chan_console/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/funcs/func_odbc.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/funcs/func_odbc.c (original)
+++ team/russell/chan_console/funcs/func_odbc.c Sun Dec 31 00:08:20 2006
@@ -95,7 +95,7 @@
  */
 static int acf_odbc_write(struct ast_channel *chan, char *cmd, char *s, const char *value)
 {
-	struct odbc_obj *obj;
+	struct odbc_obj *obj = NULL;
 	struct acf_odbc_query *query;
 	char *t, buf[2048]="", varname[15];
 	int i, dsn;
@@ -195,7 +195,7 @@
 
 static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf, size_t len)
 {
-	struct odbc_obj *obj;
+	struct odbc_obj *obj = NULL;
 	struct acf_odbc_query *query;
 	char sql[2048] = "", varname[15], colnames[2048] = "";
 	int res, x, buflen = 0, escapecommas, dsn;

Modified: team/russell/chan_console/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/channel.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/main/channel.c (original)
+++ team/russell/chan_console/main/channel.c Sun Dec 31 00:08:20 2006
@@ -686,10 +686,10 @@
 
 	if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
 		ast_string_field_build(tmp, uniqueid, "%li.%d", (long) time(NULL), 
-			ast_atomic_fetchadd_int(&uniqueint, 1));
+				       ast_atomic_fetchadd_int(&uniqueint, 1));
 	} else {
 		ast_string_field_build(tmp, uniqueid, "%s-%li.%d", ast_config_AST_SYSTEM_NAME, 
-			(long) time(NULL), ast_atomic_fetchadd_int(&uniqueint, 1));
+				       (long) time(NULL), ast_atomic_fetchadd_int(&uniqueint, 1));
 	}
 
 	if (!ast_strlen_zero(name_fmt)) {

Modified: team/russell/chan_console/main/rtp.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/main/rtp.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/main/rtp.c (original)
+++ team/russell/chan_console/main/rtp.c Sun Dec 31 00:08:20 2006
@@ -3070,6 +3070,11 @@
 		    (c0->masq || c0->masqr || c1->masq || c1->masqr)) {
 			if (option_debug > 2)
 				ast_log(LOG_DEBUG, "p2p-rtp-bridge: Oooh, something is weird, backing out\n");
+			/* If a masquerade needs to happen we have to try to read in a frame so that it actually happens. Without this we risk being called again and going into a loop */
+			if ((c0->masq || c0->masqr) && (fr = ast_read(c0)))
+				ast_frfree(fr);
+			if ((c1->masq || c1->masqr) && (fr = ast_read(c1)))
+				ast_frfree(fr);
 			res = AST_BRIDGE_RETRY;
 			break;
 		}

Modified: team/russell/chan_console/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/pbx/pbx_ael.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/pbx/pbx_ael.c (original)
+++ team/russell/chan_console/pbx/pbx_ael.c Sun Dec 31 00:08:20 2006
@@ -149,6 +149,20 @@
 static pval *get_extension_or_contxt(pval *p);
 static pval *get_contxt(pval *p);
 static void remove_spaces_before_equals(char *str);
+static void substitute_commas(char *str);
+
+/* I am adding this code to substitute commas with vertbars in the args to apps */
+static void substitute_commas(char *str)
+{
+	char *p = str;
+	while (p && *p)
+	{
+		if (*p == ',' && ((p != str && *(p-1) != '\\')
+				|| p == str))
+			*p = '|';
+		p++;
+	}
+}
 
 
 /* PRETTY PRINTER FOR AEL:  ============================================================================= */
@@ -208,7 +222,7 @@
 		fprintf(fin,"%s(", item->u1.str);
 		for (lp=item->u2.arglist; lp; lp=lp->next) {
 			if ( lp != item->u2.arglist )
-				fprintf(fin,", ");
+				fprintf(fin,",");
 			fprintf(fin,"%s", lp->u1.str);
 		}
 		fprintf(fin,");\n");
@@ -3396,6 +3410,7 @@
 			for (p2 = p->u2.arglist; p2; p2 = p2->next) {
 				if (p2 != p->u2.arglist )
 					strcat(buf1,"|");
+				substitute_commas(p2->u1.str);
 				strcat(buf1,p2->u1.str);
 			}
 			pr->app = strdup(p->u1.str);

Modified: team/russell/chan_console/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/pbx/pbx_config.c?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/pbx/pbx_config.c (original)
+++ team/russell/chan_console/pbx/pbx_config.c Sun Dec 31 00:08:20 2006
@@ -1535,7 +1535,7 @@
 			append_interface(iface, sizeof(iface), tmp);
 		}
 		if (ast_true(ast_config_option(cfg, cat, "hasiax"))) {
-			snprintf(tmp, sizeof(tmp), "IAX/%s", cat);
+			snprintf(tmp, sizeof(tmp), "IAX2/%s", cat);
 			append_interface(iface, sizeof(iface), tmp);
 		}
 		if (ast_true(ast_config_option(cfg, cat, "hash323"))) {

Modified: team/russell/chan_console/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/sounds/Makefile?view=diff&rev=49077&r1=49076&r2=49077
==============================================================================
--- team/russell/chan_console/sounds/Makefile (original)
+++ team/russell/chan_console/sounds/Makefile Sun Dec 31 00:08:20 2006
@@ -80,7 +80,7 @@
 	if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
 	if test ! -f $${PACKAGE}; then exit 1; fi; \
 	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-	(cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+	(cd $(SOUNDS_DIR)/en; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
 	touch $@
 
 $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download
@@ -104,7 +104,7 @@
 	if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
 	if test ! -f $${PACKAGE}; then exit 1; fi; \
 	rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
-	(cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+	(cd $(SOUNDS_DIR)/en; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
 	touch $@
 
 $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: have_download
@@ -142,10 +142,10 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
+$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
 	mkdir -p $@
 
-install: $(SOUNDS_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)



More information about the asterisk-commits mailing list