mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
DISA fix, makefile fix (bug #3049)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
#include <asterisk/module.h>
|
#include <asterisk/module.h>
|
||||||
#include <asterisk/translate.h>
|
#include <asterisk/translate.h>
|
||||||
#include <asterisk/ulaw.h>
|
#include <asterisk/ulaw.h>
|
||||||
|
#include <asterisk/callerid.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -114,7 +115,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
|
|||||||
int digittimeout = 10000;
|
int digittimeout = 10000;
|
||||||
struct localuser *u;
|
struct localuser *u;
|
||||||
char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
|
char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
|
||||||
char *ourcontext,*ourcallerid,*ourcidname,*ourcidnum,*mailbox;
|
char *ourcontext,*ourcallerid,ourcidname[256],ourcidnum[256],*mailbox;
|
||||||
struct ast_frame *f;
|
struct ast_frame *f;
|
||||||
struct timeval lastout, now, lastdigittime;
|
struct timeval lastout, now, lastdigittime;
|
||||||
int res;
|
int res;
|
||||||
|
@@ -16,11 +16,11 @@ TARGET+=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f
|
|||||||
all: depend $(TARGET)
|
all: depend $(TARGET)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
if [ "$(TARGET)" != "none" ]; then \
|
for x in $(TARGET); do \
|
||||||
for x in $(TARGET); do \
|
if [ "$$x" != "none" ]; then \
|
||||||
install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
|
install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \
|
||||||
done ; \
|
fi; \
|
||||||
fi
|
done
|
||||||
|
|
||||||
none:
|
none:
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user