diff options
author | Jani Nikula <jani.nikula@intel.com> | 2016-07-01 15:24:44 +0300 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-07-01 16:16:07 -0600 |
commit | 6387872c86ea6698ed8faa3ccad1d1bd60f762f7 (patch) | |
tree | 22b2b0947349caacc25eb011978e0eae495972f0 | |
parent | a569bf69f069a86a6914453cc1ab5371d173caf1 (diff) | |
download | linux-stable-6387872c86ea6698ed8faa3ccad1d1bd60f762f7.tar.gz linux-stable-6387872c86ea6698ed8faa3ccad1d1bd60f762f7.tar.bz2 linux-stable-6387872c86ea6698ed8faa3ccad1d1bd60f762f7.zip |
Documentation/sphinx: skip build if user requested specific DOCBOOKS
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 <markus.heiser@darmarit.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Fixes: 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r-- | Documentation/Makefile.sphinx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index 6c203745b6c6..d8d13c92a178 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -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 |