Skip to content

Commit

Permalink
Documentation/sphinx: skip build if user requested specific DOCBOOKS
Browse files Browse the repository at this point in the history
If the user requested specific DocBooks to be built using 'make
DOCBOOKS=foo.xml htmldocs', assume no Sphinx build is desired. This
check is transitional, and can be removed once we drop the DocBook
build.

Cc: Markus Heiser <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Fixes: 22cba31 ("Documentation/sphinx: add basic working Sphinx configuration and build")
Signed-off-by: Jani Nikula <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
  • Loading branch information
jnikula authored and Jonathan Corbet committed Jul 1, 2016
1 parent a569bf6 commit 6387872
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Documentation/Makefile.sphinx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ ifeq ($(HAVE_SPHINX),0)
$(warning The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed and in PATH, or set the SPHINXBUILD make variable to point to the full path of the '$(SPHINXBUILD)' executable.)
@echo " SKIP Sphinx $@ target."

else ifneq ($(DOCBOOKS),)

# Skip Sphinx build if the user explicitly requested DOCBOOKS.
.DEFAULT:
@echo " SKIP Sphinx $@ target (DOCBOOKS specified)."

else # HAVE_SPHINX

# User-friendly check for rst2pdf
Expand Down

0 comments on commit 6387872

Please sign in to comment.