diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-04 00:26:21 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-04 00:26:21 +0000 |
commit | 41eb95e0557780e77042b979ffc151532e866b6d (patch) | |
tree | db50802df6ebd873ba2c249b4c9a094410bcea5a /Makefile | |
parent | 7294ba38521f6af7746f76264919cb4739966792 (diff) |
Merged revisions 44322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines
ensure that local include files are always used
avoid a duplicate function name (term_init())
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -136,8 +136,8 @@ HTTP_CGIDIR=/var/www/cgi-bin GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts) USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) -MOD_SUBDIR_CFLAGS=-I../include -OTHER_SUBDIR_CFLAGS=-I../include +MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include +OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include ifeq ($(OSARCH),linux-gnu) ifeq ($(PROC),x86_64) |