summaryrefslogtreecommitdiff
path: root/Documentation/Makefile.sphinx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-15 07:33:47 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-15 07:33:47 -0300
commit425efba23509e18e39d0056799004f2005b66b15 (patch)
tree5974ef02240a16194c9db3a93427991c56a9b30c /Documentation/Makefile.sphinx
parente6e9c9b238e49e4973391078952b34d3bde3df99 (diff)
parent547218864afb2745d9d137f005f3380ef96b26ab (diff)
Merge branch 'docs-next' of git://git.lwn.net/linux into devel/docs-next
* 'docs-next' of git://git.lwn.net/linux: doc-rst: add an option to ignore DocBooks when generating docs workqueue: Fix a typo in workqueue.txt Doc: ocfs: Fix typo in filesystems/ocfs2-online-filecheck.txt Documentation/sphinx: skip build if user requested specific DOCBOOKS Documentation: add cleanmediadocs to the documentation targets
Diffstat (limited to 'Documentation/Makefile.sphinx')
-rw-r--r--Documentation/Makefile.sphinx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 4c87a41e8ca8..fd565e1f1368 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
@@ -57,6 +63,7 @@ sgmldocs:
psdocs:
mandocs:
installmandocs:
+cleanmediadocs:
cleandocs:
$(Q)rm -rf $(BUILDDIR)