Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux

[cascardo/linux.git] / Documentation / Makefile.sphinx

diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index bcb07f8..857f1e2 100644 (file)
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -38,9 +38,10 @@ ALLSPHINXOPTS   = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(B
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 quiet_cmd_sphinx = SPHINX  $@
-      cmd_sphinx = $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
+      cmd_sphinx = BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
 
 htmldocs:
+       $(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/media/Makefile $@
        $(call cmd,sphinx,html)
 
 pdfdocs:
@@ -62,7 +63,6 @@ sgmldocs:
 psdocs:
 mandocs:
 installmandocs:
-cleanmediadocs:
 
 cleandocs:
        $(Q)rm -rf $(BUILDDIR)