X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=doc%2FMakefile.local;h=dfe62295d0965fed478a75d06361ca123ae934bc;hb=cbeb0da5958b2f53059269379b219710ee7618cc;hp=eec9c228379a59688a2d9c54863c81c16e600950;hpb=0601d2337e05e6360a918244472f92db1c001fc5;p=notmuch

diff --git a/doc/Makefile.local b/doc/Makefile.local
index eec9c228..dfe62295 100644
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@ -38,9 +38,17 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info)
 	rm -f $@ && gzip --stdout $^ > $@
 
 ifeq ($(WITH_EMACS),1)
-sphinx-html sphinx-texinfo: docstring.stamp
+$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
 endif
 
+# Sequentialize the calls to sphinx-build to avoid races with
+# reading/writing cached state. This uses GNU make specific
+# "order-only" prerequisites.
+
+sphinx-html: | $(DOCBUILDDIR)/.roff.stamp
+sphinx-texinfo: | sphinx-html
+sphinx-info: | sphinx-texinfo
+
 sphinx-html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCBUILDDIR)/html
 
@@ -48,7 +56,7 @@ sphinx-texinfo:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
 
 sphinx-info: sphinx-texinfo
-	make -C $(DOCBUILDDIR)/texinfo info
+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
 
 # Use the man page converter that is available. We should never depend
 # on MAN_ROFF_FILES if a converter is not available.