make sure the -I options to the headers for the version being compiled

come before any additional -I options passed in via CPPFLAGS
(closes SF bug #693747)

diff --git a/expat/Makefile.in b/expat/Makefile.in
index 4e9bf18c520bdb56589d9adbc80b5de6a9298a5c..3452644c8ff80534eb430e794b691bf8f048f5e8 100644 (file)
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -111,7 +111,7 @@ VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
 ### autoconf this?
 LTFLAGS = --silent
 
-COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@