bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #17777 : lambda/rust/fix-docs-short-hash, r=alexcrichton

Browse source 
The escaped newline in the middle of the variable reference breaks the
short hash substitution, leaving the link text exmpty; rewrap so that
each replacement is on its own line.
This commit is contained in:
bors 2014-10-05 09:07:06 +00:00
commit dfbe9eb3b2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/docs.mk
View file

@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \ doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
$(wildcard $(D)/*.*) | doc/ $(wildcard $(D)/*.*) | doc/
@$(call E, version-info: $@) @$(call E, version-info: $@)
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \ $(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; \
CFG_SHORT_VER_HASH)/; \ s/SHORT_HASH/$(CFG_SHORT_VER_HASH)/; \
s/STAMP/$(CFG_VER_HASH)/;" $< >$@ s/STAMP/$(CFG_VER_HASH)/;" $< >$@
GENERATED += doc/version.tex doc/version_info.html GENERATED += doc/version.tex doc/version_info.html