Skip to content

Commit 9eadcac

Browse files
committed
doc: have a real switch b/w LaTeX compilers
1 parent 862aced commit 9eadcac

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,8 @@ probe CFG_ISCC iscc
455455
probe CFG_LLNEXTGEN LLnextgen
456456
probe CFG_PANDOC pandoc
457457
probe CFG_PDFLATEX pdflatex
458-
probe CFG_XETEX xetex
459-
probe CFG_LUATEX luatex
458+
probe CFG_XELATEX xelatex
459+
probe CFG_LUALATEX lualatex
460460
probe CFG_GDB gdb
461461
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
462462
then

mk/docs.mk

+14-12
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,20 @@ endif
7373
# Check for the various external utilities for the EPUB/PDF docs:
7474

7575
ifeq ($(CFG_PDFLATEX),)
76-
$(info cfg: no pdflatex found, omitting doc/rust.pdf)
77-
NO_PDF_DOCS = 1
78-
else
79-
ifeq ($(CFG_XETEX),)
80-
$(info cfg: no xetex found, disabling doc/rust.pdf)
81-
NO_PDF_DOCS = 1
76+
$(info cfg: no pdflatex found, deferring to xelatex)
77+
ifeq ($(CFG_XELATEX),)
78+
$(info cfg: no xelatex found, deferring to lualatex)
79+
ifeq ($(CFG_LUALATEX),)
80+
$(info cfg: no lualatex found, disabling LaTeX docs)
81+
NO_PDF_DOCS = 1
82+
else
83+
CFG_LATEX := $(CFG_LUALATEX)
84+
endif
8285
else
83-
ifeq ($(CFG_LUATEX),)
84-
$(info cfg: lacking luatex, disabling pdflatex)
85-
NO_PDF_DOCS = 1
86-
endif
86+
CFG_LATEX := $(CFG_XELATEX)
8787
endif
88+
else
89+
CFG_LATEX := $(CFG_PDFLATEX)
8890
endif
8991

9092

@@ -175,8 +177,8 @@ ifneq ($(NO_PDF_DOCS),1)
175177
ifeq ($$(SHOULD_BUILD_PDF_DOC_$(1)),1)
176178
DOC_TARGETS += doc/$(1).pdf
177179
doc/$(1).pdf: doc/$(1).tex
178-
@$$(call E, pdflatex: $$@)
179-
$$(Q)$$(CFG_PDFLATEX) \
180+
@$$(call E, latex compiler: $$@)
181+
$$(Q)$$(CFG_LATEX) \
180182
-interaction=batchmode \
181183
-output-directory=doc \
182184
$$<

0 commit comments

Comments
 (0)