From ae4f85dde3abb7d4afef9e869a83783cbf0aa29c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 30 Mar 2005 06:07:33 +0000
Subject: [PATCH] 1843.   [cleanup]       CINCLUDES takes precedence over
 CFLAGS.  This helps                         when CFLAGS contains "-I
 /usr/local/include"                         resulting in old header files
 being used.

---
 CHANGES       | 6 +++++-
 make/rules.in | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index e7ff0b0eb6..d5ec92842c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
-1841.	[port]		cmsg_len() could produce incorrect results on
+1843.	[cleanup]	CINCLUDES takes precedence over CFLAGS.  This helps
+			when CFLAGS contains "-I /usr/local/include"
+			resulting in old header files being used.
+
+1842.	[port]		cmsg_len() could produce incorrect results on
 			some platform. [RT #13744]
 
 1841.	[placeholder]	rt13694
diff --git a/make/rules.in b/make/rules.in
index 2be8b2ca88..f7e185c1ba 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.48 2004/07/20 07:13:43 marka Exp $
+# $Id: rules.in,v 1.49 2005/03/30 06:07:33 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -112,8 +112,7 @@ ALL_CPPFLAGS = \
 	${ALWAYS_INCLUDES} ${CINCLUDES} ${STD_CINCLUDES} \
 	${ALWAYS_DEFINES} ${CDEFINES} ${STD_CDEFINES}
 
-ALL_CFLAGS = ${EXT_CFLAGS} ${CFLAGS} \
-	${ALL_CPPFLAGS} \
+ALL_CFLAGS = ${EXT_CFLAGS} ${ALL_CPPFLAGS} ${CFLAGS} \
 	${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
 
 .c.@O@: