From: Sarah Day <sarahday@mit.edu>
Date: Wed, 27 Jul 2016 16:44:49 +0000 (-0400)
Subject: Move CFLAGS and CPPFLAGS after local includes
X-Git-Tag: krb5-1.15-beta1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5392327b479fd1b964fd72b3b3a0b5b3e04df3a6;p=thirdparty%2Fkrb5.git

Move CFLAGS and CPPFLAGS after local includes

The gss-kernel-lib Makefile overrides ALL_CFLAGS.  It was setting
the CFLAGS and CPPFLAGS to occur before local includes, which
causes some compilers to include system header files before the
local header files.  Moving the CPPFLAGS and CFLAGS to the end of
ALL_CFLAGS corrects this behavior.
---

diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index f70f3c6550..82f53919a4 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -2,7 +2,7 @@ mydir=util/gss-kernel-lib
 BUILDTOP=$(REL)..$(S)..
 
 DEFINES=-DKRB5_KERNEL
-ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi
+ALL_CFLAGS=$(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi $(CPPFLAGS) $(CFLAGS)
 
 SHLIB_EXPDEPS = \
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \