diff options
| author | bors <bors@rust-lang.org> | 2014-10-05 09:07:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-05 09:07:06 +0000 |
| commit | dfbe9eb3b24fdc7ea5c78f96fedec6630476dec7 (patch) | |
| tree | a8679c8e0769ea38211968aa8ee842eaae03c242 | |
| parent | 5660db2508159513e0ade032ae9349977e7371b5 (diff) | |
| parent | df4051e0b1930aade69a821c225cd89870cbfd56 (diff) | |
| download | rust-dfbe9eb3b24fdc7ea5c78f96fedec6630476dec7.tar.gz rust-dfbe9eb3b24fdc7ea5c78f96fedec6630476dec7.zip | |
auto merge of #17777 : lambda/rust/fix-docs-short-hash, r=alexcrichton
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.
| -rw-r--r-- | mk/docs.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/docs.mk b/mk/docs.mk index 26439948aa4..725b95d4385 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \ $(wildcard $(D)/*.*) | doc/ @$(call E, version-info: $@) - $(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \ - CFG_SHORT_VER_HASH)/; \ + $(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; \ + s/SHORT_HASH/$(CFG_SHORT_VER_HASH)/; \ s/STAMP/$(CFG_VER_HASH)/;" $< >$@ GENERATED += doc/version.tex doc/version_info.html |