From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 4 Jun 2001 17:16:12 +0000 (+0000)
Subject: -I$(includedir) is moved from INCLUDES variable to the end of
X-Git-Tag: mutt-1-3-19-rel~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f67198150c58d0c83c520af8c9a68a4ac781c69;p=mutt

-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 4e8c878a..95922b93 100644
--- 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 \