diff options
-rwxr-xr-x | apps/app_disa.c | 3 | ||||
-rwxr-xr-x | utils/Makefile | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/app_disa.c b/apps/app_disa.c index 3413d6efd..7519c1213 100755 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -23,6 +23,7 @@ #include <asterisk/module.h> #include <asterisk/translate.h> #include <asterisk/ulaw.h> +#include <asterisk/callerid.h> #include <string.h> #include <stdlib.h> #include <stdio.h> @@ -114,7 +115,7 @@ static int disa_exec(struct ast_channel *chan, void *data) int digittimeout = 10000; struct localuser *u; 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 timeval lastout, now, lastdigittime; int res; diff --git a/utils/Makefile b/utils/Makefile index dd9546fa0..e8a5602ba 100755 --- a/utils/Makefile +++ b/utils/Makefile @@ -16,11 +16,11 @@ TARGET+=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f all: depend $(TARGET) 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; \ - done ; \ - fi + fi; \ + done none: |