Merge branch 'release'

[notmuch] / doc / Makefile.local

diff --git a/doc/Makefile.local b/doc/Makefile.local
index eec9c228379a59688a2d9c54863c81c16e600950..bab3d0d286ce75efe68433b3a8c82ab87eac7dd6 100644 (file)
--- 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