From bcefd63e2fc1240882c4d922f85faafae90fcbb3 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Sun, 18 Sep 2005 02:35:10 +0000 Subject: [PATCH] Stupid hack to synchronise on makedoc for parallel builds. Only works when entered via make all. make stamp-doc-xml directly can fail in pathological conditions. --- doc/Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index 1671e8b0..a06116c3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -67,9 +67,12 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ ChangeLog.old \ README NEWS TODO README.SECURITY README.SSL -all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt +all: ../makedoc$(EXEEXT) + $(MAKE) makedoc-all -install: all instdoc +makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt + +install: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 @@ -163,7 +166,7 @@ dist distdir: Makefile $(DISTFILES) ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c (cd .. && $(MAKE) makedoc$(EXEEXT)) -update-doc: ../makedoc$(EXEEXT) stamp-doc-xml stamp-doc-chunked manual.txt manual.html +update-doc: ../makedoc$(EXEEXT) stamp-doc-xml stamp-doc-chunked manual.txt manual.html muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \ @@ -178,7 +181,6 @@ mutt.1: $(srcdir)/mutt.man $(EDIT) $(srcdir)/mutt.man > $@ stamp-doc-xml: $(top_srcdir)/init.h manual.xml.head manual.xml.tail $(top_srcdir)/VERSION - $(MAKE) ../makedoc$(EXEEXT) ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.xml.head ;\ $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) | \ cat - $(srcdir)/manual.xml.tail > manual.xml -- 2.40.0