From: Jonathan Corbet <corbet@lwn.net>
Date: Mon, 6 Feb 2017 16:05:31 +0000 (-0700)
Subject: Merge branch 'ben' into docs-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f161e9a270bea2b18c62f75d497900faee1e4ceb;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'ben' into docs-next

Ben writes: "This series fixes some bugs I found in the new doc build system."
---

f161e9a270bea2b18c62f75d497900faee1e4ceb
diff --cc Documentation/Makefile.sphinx
index fd32fc727777,e14d82a98062..48b2b0241a3a
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@@ -54,8 -54,7 +54,8 @@@ loop_cmd = $(echo-cmd) $(cmd_$(1)) || e
  #    e.g. "media" for the linux-tv book-set at ./Documentation/media
  
  quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
-       cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2;\
+       cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2 && \
 +	PYTHONDONTWRITEBYTECODE=1 \
  	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
  	$(SPHINXBUILD) \
  	-b $2 \
@@@ -86,16 -85,11 +86,16 @@@ pdfdocs: latexdoc
  endif # HAVE_PDFLATEX
  
  epubdocs:
- 	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,epub,$(var),epub,$(var)))
+ 	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,epub,$(var),epub,$(var)))
  
  xmldocs:
- 	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var)))
+ 	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var)))
  
 +endif # HAVE_SPHINX
 +
 +# The following targets are independent of HAVE_SPHINX, and the rules should
 +# work or silently pass without Sphinx.
 +
  # no-ops for the Sphinx toolchain
  sgmldocs:
  psdocs: