[asterisk-commits] russell: trunk r53498 - in /trunk: ./ main/db1-ast/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Feb  7 17:56:46 2007
New Revision: 53498

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53498
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/db1-ast/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/db1-ast/Makefile?view=diff&rev=53498&r1=53497&r2=53498
==============================================================================
--- trunk/main/db1-ast/Makefile (original)
+++ trunk/main/db1-ast/Makefile Wed Feb  7 17:56:46 2007
@@ -48,7 +48,7 @@
 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)