1843. [cleanup] CINCLUDES takes precedence over CFLAGS. This helps

                        when CFLAGS contains "-I /usr/local/include"
                        resulting in old header files being used.

diff --git a/CHANGES b/CHANGES
index e7ff0b0eb60f110b35b62bb27d140eb51b8b29d7..d5ec92842cc20bf481f2d44d73ff7ca5824ae983 100644 (file)
--- 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 2be8b2ca881f4cd7571220514e9f8336993fabc8..f7e185c1bae2f3b124ae1d090d0274a022fba4d7 100644 (file)
--- 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@: