[master] 4232439a7 sphinx: Close link race

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Oct 27 18:11:07 UTC 2020


commit 4232439a76ff1a16d58ed73926145f907db14af5
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Oct 22 18:44:19 2020 +0200

    sphinx: Close link race
    
    We can't start linking files from $(srcdir) to $(builddir) until we are
    done populating files in $(builddir). Make sure we defer linking until
    after all sphinx sources are ready.

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index b5cf56dc5..02a691cb9 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -20,7 +20,7 @@ clean:
 
 # use index.rst as an indicator if we have copied already
 .PHONY: link_srcdir
-link_srcdir:
+link_srcdir: graphviz conf.py $(BUILT_SOURCES)
 	if test "x$(srcdir)" != "x$(builddir)" && test ! -f index.rst; then \
 		s=`realpath $(srcdir)`; \
 		for f in `cd $$s && find . -type f`; do \
@@ -35,7 +35,7 @@ link_srcdir:
 graphviz:
 	cd ../graphviz && $(MAKE) html
 
-sphinx_prereq: link_srcdir graphviz conf.py
+sphinx_prereq: link_srcdir
 
 all: link_srcdir
 


More information about the varnish-commit mailing list