Build diff from Brendan Cully.

diff --git a/Makefile.am b/Makefile.am
index 81fce7835ad6a48837f2c64a44209388ac3a40a1..e751ced43f4af1e0f5fea6222875525ee9d8b08b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
 
 # top_srcdir is for building outside of the source tree
-INCLUDES=-I$(top_srcdir) -I. $(IMAP_INCLUDES) -I$(includedir)
+INCLUDES=-I$(top_srcdir) -I. $(IMAP_INCLUDES) -Iintl -I$(includedir)
 
 non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1dgst.c \
        gnupgparse.c sha.h sha_locl.h \
@@ -183,7 +183,6 @@ Muttrc: stamp-doc-rc
 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
        -rm -f Muttrc stamp-doc-rc
        $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-               $(srcdir)/init.h | ./makedoc -c | cat $(srcdir)/Muttrc.head - \
-               > Muttrc
+               $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
        touch stamp-doc-rc
 

diff --git a/imap/Makefile.am b/imap/Makefile.am
index f61b5b7ac3e34f01fb02eb6013deb0f108aaef2f..27bc38ad10bd5b08b1834c2c74928fe7baa7e275 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -13,7 +13,7 @@ endif
 
 EXTRA_DIST = BUGS README TODO imap_ssl.c imap_ssl.h auth_gss.c
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I../intl
 
 noinst_LIBRARIES = libimap.a
 noinst_HEADERS = imap_private.h imap_socket.h md5.h message.h $(SSLHEADERS)