---

yaml
---
r: 149864
b: refs/heads/try2
c: 9eadcac
h: refs/heads/master
v: v3

Author: adrientetar

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 862acedf514fe806d2ab7d337fc0e156faf1d7b4
+refs/heads/try2: 9eadcacdd76d12c72284ddc122625488f297dea8
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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

branches/try2/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 \
 	$$<