diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
| commit | 52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (patch) | |
| tree | 10746baee8fd439130ab78e6caaadc609a7920d7 /Documentation/Makefile.sphinx | |
| parent | e9d488c3114acb6a0a93e99c02f9cd1d656f46c7 (diff) | |
| parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"Three fixes for the docs build, including removing an annoying warning
on 'make help' if sphinx isn't present"
* tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
Documenation: update cgroup's document path
Documentation/sphinx: do not warn about missing tools in 'make help'
Diffstat (limited to 'Documentation/Makefile.sphinx')
| -rw-r--r-- | Documentation/Makefile.sphinx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index b10b6c598ae2..857f1e273418 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -67,6 +67,8 @@ installmandocs: cleandocs: $(Q)rm -rf $(BUILDDIR) +endif # HAVE_SPHINX + dochelp: @echo ' Linux kernel internal documentation in different formats (Sphinx):' @echo ' htmldocs - HTML' @@ -74,5 +76,3 @@ dochelp: @echo ' epubdocs - EPUB' @echo ' xmldocs - XML' @echo ' cleandocs - clean all generated files' - -endif # HAVE_SPHINX |