Make -j2 in doc work (closes: #2538)

diff --git a/ChangeLog b/ChangeLog
index 3dea57d3640e629df070ba6dbaf62171c7dbcc5f..e692d1fff1ba1657452ecaa291564b98fdb53264 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-03-29 15:23 -0700  Christoph Berg  <cb@df7cb.de>  (0514e6b5a67a)
+
+       * init.c, init.h: Use ~/.muttrc as the default alias_file if no user
+       muttrc exists. Makes the code agree with the documentation. Document
+       that default is actually the used muttrc. (Closes Debian #226500.)
+
+2007-03-29 10:30 -0700  Brendan Cully  <brendan@kublai.com>  (034ad0e55397)
+
+       * bcache.c, bcache.h, imap/message.c: Make message cache write to
+       temporary location until file is complete. Previously mutt trusted
+       the cache file even when it was incomplete, causing permanently
+       incorrect message display if the fetch was interrupted for some
+       reason.
+
 2007-03-28 09:43 +0200  Thomas Roessler  <roessler@does-not-exist.org>  (25cbd5588d35)
 
        * alias.c: Fix debug message for mutt_adr_is_user

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 69039908617cfad73ab132f221ee3fc7e68df7b9..c151d56b38ea5e9ff6515a448fbe2a1f4e6becf1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 subdir = doc
 
 DSLROOT = @DSLROOT@
@@ -92,6 +90,8 @@ stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml
        -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
 
+$(HTML_DOCFILES): stamp-doc-chunked
+
 manual.pdf: manual.tex
        -if test -f manual.tex; then pdfjadetex manual.tex; fi
 
@@ -133,7 +133,7 @@ mutt.1: $(srcdir)/mutt.man
 stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
-       $(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
+       $(MAKE) -j1 ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
        ( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
          sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \