@@ -46,7 +46,7 @@ RUSTDOC_HTML_OPTS = --markdown-css rust.css \
46
46
--markdown-in-header=doc/favicon.inc --markdown-after-content=doc/footer.inc
47
47
48
48
PANDOC_BASE_OPTS := --standalone --toc --number-sections
49
- PANDOC_TEX_OPTS = $(PANDOC_BASE_OPTS ) --include-before-body=doc/version.md \
49
+ PANDOC_TEX_OPTS = $(PANDOC_BASE_OPTS ) --include-before-body=doc/version.tex \
50
50
--from=markdown --include-before-body=doc/footer.tex --to=latex
51
51
PANDOC_EPUB_OPTS = $(PANDOC_BASE_OPTS ) --to=epub
52
52
@@ -100,7 +100,7 @@ endif
100
100
# Rust version
101
101
# #####################################################################
102
102
103
- doc/version.md : $(MKFILE_DEPS ) $(wildcard $(D ) /* .* ) | doc/
103
+ doc/version.tex : $(MKFILE_DEPS ) $(wildcard $(D ) /* .* ) | doc/
104
104
@$(call E, version-stamp: $@ )
105
105
$(Q ) echo " $( CFG_VERSION) " > $@
106
106
@@ -112,7 +112,7 @@ doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
112
112
$(CFG_VER_HASH) | head -c 8)/;\
113
113
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
114
114
115
- GENERATED += doc/version.md doc/version_info.html
115
+ GENERATED += doc/version.tex doc/version_info.html
116
116
117
117
# #####################################################################
118
118
# Docs, from rustdoc and sometimes pandoc
@@ -140,10 +140,6 @@ doc/footer.inc: $(D)/footer.inc | doc/
140
140
@$(call E, cp: $@ )
141
141
$(Q ) cp -a $< $@ 2> /dev/null
142
142
143
- doc/footer.tex : $(D ) /footer.tex | doc/
144
- @$(call E, cp: $@ )
145
- $(Q ) cp -a $< $@ 2> /dev/null
146
-
147
143
# The (english) documentation for each doc item.
148
144
149
145
define DEF_SHOULD_BUILD_PDF_DOC
@@ -167,9 +163,13 @@ doc/$(1).epub: $$(D)/$(1).md | doc/
167
163
@$$(call E, pandoc: $$@ )
168
164
$$(CFG_PANDOC ) $$(PANDOC_EPUB_OPTS ) $$< --output=$$@
169
165
166
+ doc/footer.tex : $(D ) /footer.inc | doc/
167
+ @$$(call E, pandoc: $$@ )
168
+ $$(CFG_PANDOC ) --from=html --to=latex $$< --output=$$@
169
+
170
170
# PDF (md =(pandoc)=> tex =(pdflatex)=> pdf)
171
171
DOC_TARGETS += doc/$(1 ) .tex
172
- doc/$(1 ) .tex : $$(D ) /$(1 ) .md doc/footer.tex doc/version.md | doc/
172
+ doc/$(1 ) .tex : $$(D ) /$(1 ) .md doc/footer.tex doc/version.tex | doc/
173
173
@$$(call E, pandoc: $$@ )
174
174
$$(CFG_PANDOC ) $$(PANDOC_TEX_OPTS ) $$< --output=$$@
175
175
0 commit comments