[asterisk-commits] file: branch 1.6.0 r112713 - in /branches/1.6.0: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: file
Date: Thu Apr  3 19:54:22 2008
New Revision: 112713

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112713
Log:
Merged revisions 112712 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r112712 | file | 2008-04-03 21:53:19 -0300 (Thu, 03 Apr 2008) | 10 lines

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.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=112713&r1=112712&r2=112713
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Thu Apr  3 19:54:22 2008
@@ -131,6 +131,7 @@
 	rm ast_expr2.o ast_expr2f.o 
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)