Merged revisions 53497 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53497 | russell | 2007-02-07 17:52:45 -0600 (Wed, 07 Feb 2007) | 6 lines

When building libdb1.a, put the additional flags needed at the beginning of
ASTCFLAGS, instead of at the end.  This way, we ensure that we find the local
headers first before accidentally trying to use headers that exist in
locations specified in the ASTCFLAGS passed from the main Makefile.
(issue #8637, ovi)

........

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

diff --git a/main/db1-ast/Makefile b/main/db1-ast/Makefile
index 15d7f6a4ff67c5e7208b62dbb0b8369a04fe19fc..73ccbd605a0474ed60892958c25106815267f986 100644 (file)
--- a/main/db1-ast/Makefile
+++ b/main/db1-ast/Makefile
@@ -48,7 +48,7 @@ clean-depend:
 clean:
        rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
 
-ASTCFLAGS+=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno
+ASTCFLAGS:=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno $(ASTCFLAGS)
 
 OSTYPE=$(shell uname -s)
 ifeq ($(OSTYPE),SunOS)