Re: [PATCH 2/3] Documentation/sphinx: make it possible to build latexdocs without pdflatex

2016-11-02 Thread Markus Heiser

Am 02.11.2016 um 10:40 schrieb Jani Nikula :

> Building latexdocs doesn't actually require $(PDFLATEX). Move the checks
> for it to the pdfdocs target which does require it, and specifically
> outside of the target in order to not depend on latexdocs when we can't
> build pdfdocs anyway.

Tested-by: Markus Heiser 

--Markus --

--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/3] Documentation/sphinx: make it possible to build latexdocs without pdflatex

2016-11-02 Thread Jani Nikula
Building latexdocs doesn't actually require $(PDFLATEX). Move the checks
for it to the pdfdocs target which does require it, and specifically
outside of the target in order to not depend on latexdocs when we can't
build pdfdocs anyway.

Signed-off-by: Jani Nikula 
---
 Documentation/Makefile.sphinx | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 1314e3ee31c4..4819638f7e21 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -69,15 +69,17 @@ htmldocs:
@$(foreach var,$(SPHINXDIRS),$(call 
loop_cmd,sphinx,html,$(var),,$(var)))
 
 latexdocs:
+   @$(foreach var,$(SPHINXDIRS),$(call 
loop_cmd,sphinx,latex,$(var),latex,$(var)))
+
 ifeq ($(HAVE_PDFLATEX),0)
+
+pdfdocs:
$(warning The '$(PDFLATEX)' command was not found. Make sure you have 
it installed and in PATH to produce PDF output.)
@echo "  SKIPSphinx $@ target."
+
 else # HAVE_PDFLATEX
-   @$(foreach var,$(SPHINXDIRS),$(call 
loop_cmd,sphinx,latex,$(var),latex,$(var)))
-endif # HAVE_PDFLATEX
 
 pdfdocs: latexdocs
-ifneq ($(HAVE_PDFLATEX),0)
$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=$(PDFLATEX) 
LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex)
 
 endif # HAVE_PDFLATEX
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html