From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Sun, 22 Sep 2019 15:29:42 +0000 (-0400)
Subject: Revert "docs: Makefile: remove no-ops targets"
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44539e32fee17ff6943dad8f0177c1280df6d301;p=linux

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 e145e4db508b..d49a6aa06ba5 100644
--- 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 a8e6ab818983..ef10bcba43de 100644
--- 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 9cd289196267..968bdf6bd363 100644
--- 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 $@