Skip to content
Browse files

doc: improvements to version-stamp makefile logic.

  • Loading branch information...
1 parent 801f322 commit 79dc10dba91d242b2bbdc65e20dd0fe5fe7f3f40 @graydon graydon committed Feb 6, 2013
Showing with 6 additions and 4 deletions.
  1. +6 −4 mk/docs.mk
View
10 mk/docs.mk
@@ -45,7 +45,7 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.css
--from=markdown --to=html \
--css=rust.css \
--css=manual.css \
- --include-before-body=doc/version_info.html \
+ --include-before-body=doc/version_info.html \
--output=$@
endif
@@ -66,6 +66,7 @@ doc/rust.tex: rust.md doc/version.md
"$(CFG_PANDOC)" \
--standalone --toc \
--number-sections \
+ --include-before-body=doc/version.md \
--from=markdown --to=latex \
--output=$@
@@ -199,16 +200,17 @@ ifdef CFG_DISABLE_DOCS
endif
-doc/version.md: $(MKFILE_DEPS) rust.md
+doc/version.md: $(MKFILE_DEPS) $(wildcard $(S)doc/*.*)
@$(call E, version-stamp: $@)
$(Q)echo "$(CFG_VERSION)" >$@
-doc/version_info.html: version_info.html.template
+doc/version_info.html: version_info.html.template $(MKFILE_DEPS) \
+ $(wildcard $(S)doc/*.*)
@$(call E, version-info: $@)
sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
$(CFG_VER_HASH) | head -c 8)/;\
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
-GENERATED += doc/version.md
+GENERATED += doc/version.md doc/version_info.html
docs: $(DOCS)

0 comments on commit 79dc10d

Please sign in to comment.
Something went wrong with that request. Please try again.