From: Joshua Colp <jcolp@digium.com>
Date: Fri, 4 Apr 2008 00:53:19 +0000 (+0000)
Subject: Merged revisions 112711 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7b2e732f0c54cb77d8d0019e5f37970a8cfd78a;p=thirdparty%2Fasterisk.git

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

........
r112711 | file | 2008-04-03 21:52:36 -0300 (Thu, 03 Apr 2008) | 2 lines

Pass in the path to Zaptel for systems that install Zaptel headers in a separate location.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@112712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/Makefile b/main/Makefile
index b24e19e816..976c37b144 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -131,6 +131,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
 	rm ast_expr2.o ast_expr2f.o 
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)