-I$(includedir) is moved from INCLUDES variable to the end of

CPPFLAGS.  This allow build Mutt with Bruno's libiconv and
--prefix=/usr on glibc-2.1.2 systems.

From "Andrew W. Nosenko" <awn@bcs.zp.ua>.

diff --git a/Makefile.am b/Makefile.am
index 4e8c878a54f59ef8030038a00cb79d7051dcf222..95922b93d2609671664c374497f2e176225a10cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,9 @@ CPP=@CPP@
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl -I$(includedir)
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+
+CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c \
        pgpmicalg.c gnupgparse.c sha1.h \