Revert "docs: Makefile: remove no-ops targets"

This reverts commit 18afab8c1d3c2a463eece561e9f15a1704b5eff9.

(cherry picked from commit 697451f51e136db9a8d373726701ffbe2440ecf0)
(cherry picked from commit 250887f1296220d5dd87eb312de6bbe9083d8c18)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index e145e4db508bc6a45ed598f0cb3564893d0bc026..d49a6aa06ba582520bec06ecea10a22b9bb462a8 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -117,6 +117,16 @@ endif # HAVE_SPHINX
 refcheckdocs:
        $(Q)cd $(srctree);scripts/documentation-file-ref-check
 
+# no-ops for the Sphinx toolchain
+sgmldocs:
+       @:
+psdocs:
+       @:
+mandocs:
+       @:
+installmandocs:
+       @:
+
 cleandocs:
        $(Q)rm -rf $(BUILDDIR)
        $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean

diff --git a/Documentation/translations/zh_CN/process/howto.rst b/Documentation/translations/zh_CN/process/howto.rst
index a8e6ab818983a80a3a45f2775f0f9f41a14eca37..ef10bcba43de34832f29d5d2ae69b763f7ec615e 100644 (file)
--- a/Documentation/translations/zh_CN/process/howto.rst
+++ b/Documentation/translations/zh_CN/process/howto.rst
@@ -151,7 +151,9 @@ Linux内核代码中包含有大量的文档。这些文档对于学习如何与
 这些文档都可以通过运行以下命令从内核代码中生成为PDF或HTML文档::
 
     make pdfdocs
+    make psdocs
     make htmldocs
+    make mandocs
 
 ReST格式的文档会生成在 Documentation/output. 目录中。
 它们也可以用下列命令生成 LaTeX 和 ePub 格式文档::

diff --git a/Makefile b/Makefile
index 9cd289196267131a6261188a11a3614fec2c4206..968bdf6bd363b9c8a32444dc23d5cae5f1b8f818 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1555,8 +1555,9 @@ $(help-board-dirs): help-%:
 
 # Documentation targets
 # ---------------------------------------------------------------------------
-DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \
-              linkcheckdocs dochelp refcheckdocs
+
+DOC_TARGETS := xmldocs sgmldocs psdocs latexdocs pdfdocs htmldocs mandocs installmandocs epubdocs cleandocs linkcheckdocs dochelp refcheckdocs
+
 PHONY += $(DOC_TARGETS)
 $(DOC_TARGETS):
        $(Q)$(MAKE) $(build)=Documentation $@