doc: have a real switch b/w LaTeX compilers

diff --git a/configure b/configure
index 873ff54722e33a7e4124033eb0ba39bfb042154a..f470fd6f26c20d1a298060385005b97b01615bd0 100755 (executable)
--- a/configure
+++ b/configure
@@ -455,8 +455,8 @@ probe CFG_ISCC             iscc
 probe CFG_LLNEXTGEN        LLnextgen
 probe CFG_PANDOC           pandoc
 probe CFG_PDFLATEX         pdflatex
-probe CFG_XETEX            xetex
-probe CFG_LUATEX           luatex
+probe CFG_XELATEX          xelatex
+probe CFG_LUALATEX         lualatex
 probe CFG_GDB              gdb
 if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
 then

diff --git a/mk/docs.mk b/mk/docs.mk
index 58a62b47aa09363b423e7daaad4ee154e2f3766e..7a8dfd2d58f391879d507b5f2ce402f855f6762c 100644 (file)
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -73,18 +73,20 @@ endif
 # Check for the various external utilities for the EPUB/PDF docs:
 
 ifeq ($(CFG_PDFLATEX),)
-  $(info cfg: no pdflatex found, omitting doc/rust.pdf)
-  NO_PDF_DOCS = 1
-else
-  ifeq ($(CFG_XETEX),)
-    $(info cfg: no xetex found, disabling doc/rust.pdf)
-    NO_PDF_DOCS = 1
+  $(info cfg: no pdflatex found, deferring to xelatex)
+  ifeq ($(CFG_XELATEX),)
+    $(info cfg: no xelatex found, deferring to lualatex)
+    ifeq ($(CFG_LUALATEX),)
+      $(info cfg: no lualatex found, disabling LaTeX docs)
+      NO_PDF_DOCS = 1
+       else
+      CFG_LATEX := $(CFG_LUALATEX)
+    endif
   else
-    ifeq ($(CFG_LUATEX),)
-       $(info cfg: lacking luatex, disabling pdflatex)
-       NO_PDF_DOCS = 1
-       endif
+    CFG_LATEX := $(CFG_XELATEX)
   endif
+else
+  CFG_LATEX := $(CFG_PDFLATEX)
 endif
 
 
@@ -175,8 +177,8 @@ ifneq ($(NO_PDF_DOCS),1)
 ifeq ($$(SHOULD_BUILD_PDF_DOC_$(1)),1)
 DOC_TARGETS += doc/$(1).pdf
 doc/$(1).pdf: doc/$(1).tex
-       @$$(call E, pdflatex: $$@)
-       $$(Q)$$(CFG_PDFLATEX) \
+       @$$(call E, latex compiler: $$@)
+       $$(Q)$$(CFG_LATEX) \
        -interaction=batchmode \
        -output-directory=doc \
        $$<