aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-04 00:26:21 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-04 00:26:21 +0000
commitcdae839f80c827934702a33d592a2137fb77f8aa (patch)
treedb50802df6ebd873ba2c249b4c9a094410bcea5a /Makefile
parent38f062988659847550e63f87284d9d3045b91423 (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: http://svn.digium.com/svn/asterisk/trunk@44323 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fc130f6ec..c7e8031b8 100644
--- a/Makefile
+++ b/Makefile
@@ -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)