File tree 2 files changed +16
-14
lines changed
2 files changed +16
-14
lines changed Original file line number Diff line number Diff line change @@ -455,8 +455,8 @@ probe CFG_ISCC iscc
455
455
probe CFG_LLNEXTGEN LLnextgen
456
456
probe CFG_PANDOC pandoc
457
457
probe CFG_PDFLATEX pdflatex
458
- probe CFG_XETEX xetex
459
- probe CFG_LUATEX luatex
458
+ probe CFG_XELATEX xelatex
459
+ probe CFG_LUALATEX lualatex
460
460
probe CFG_GDB gdb
461
461
if [ " $CFG_OSTYPE " = " unknown-linux-gnu" ]
462
462
then
Original file line number Diff line number Diff line change @@ -73,18 +73,20 @@ endif
73
73
# Check for the various external utilities for the EPUB/PDF docs:
74
74
75
75
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
82
85
else
83
- ifeq ($(CFG_LUATEX),)
84
- $(info cfg : lacking luatex, disabling pdflatex)
85
- NO_PDF_DOCS = 1
86
- endif
86
+ CFG_LATEX := $(CFG_XELATEX )
87
87
endif
88
+ else
89
+ CFG_LATEX := $(CFG_PDFLATEX )
88
90
endif
89
91
90
92
@@ -175,8 +177,8 @@ ifneq ($(NO_PDF_DOCS),1)
175
177
ifeq ($$(SHOULD_BUILD_PDF_DOC_$(1 ) ) ,1)
176
178
DOC_TARGETS += doc/$(1 ) .pdf
177
179
doc/$(1 ) .pdf : doc/$(1 ) .tex
178
- @$$(call E, pdflatex : $$@ )
179
- $$(Q )$$(CFG_PDFLATEX ) \
180
+ @$$(call E, latex compiler : $$@ )
181
+ $$(Q )$$(CFG_LATEX ) \
180
182
-interaction=batchmode \
181
183
-output-directory=doc \
182
184
$$<
You can’t perform that action at this time.
0 commit comments