diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-07 23:56:46 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-07 23:56:46 +0000 |
commit | 824c385d0780e15376a7e1e828b79cb274ca5d6e (patch) | |
tree | 1fb1378f6f87755657f1ce857735b3a0ac154b71 /main/db1-ast | |
parent | 121cf8a56782b4edcdba70d384db5f75a8f91d52 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@53498 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/db1-ast')
-rw-r--r-- | main/db1-ast/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/db1-ast/Makefile b/main/db1-ast/Makefile index 15d7f6a4f..73ccbd605 100644 --- 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) |