diff options
| author | bors <bors@rust-lang.org> | 2014-01-06 16:31:52 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-06 16:31:52 -0800 |
| commit | b6602cb74bb10f888989c3620cd99cd897d09372 (patch) | |
| tree | f7596be372c5ff504f9c2dbd536724cb8c7c7ce1 | |
| parent | 1f1838ea3e6795487521d4541bbd877d8e0797b8 (diff) | |
| parent | 21f9fa4850a84a2997d82ced23d670c272ee6d46 (diff) | |
| download | rust-b6602cb74bb10f888989c3620cd99cd897d09372.tar.gz rust-b6602cb74bb10f888989c3620cd99cd897d09372.zip | |
auto merge of #11354 : brson/rust/versionwin, r=alexcrichton
The makefiles and the windows installer disagree on the name of this file. In practical terms this change only means that the '-pre' installers will be named 'rust-0.9-pre-install.exe' instead 'rust-0.9-install.exe'.
| -rw-r--r-- | mk/clean.mk | 2 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/clean.mk b/mk/clean.mk index c59298d1ecb..14998cfbb22 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -44,7 +44,7 @@ clean-misc: $(Q)rm -Rf $(DOCS) $(Q)rm -Rf $(GENERATED) $(Q)rm -Rf tmp/* - $(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist + $(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist $(Q)rm -Rf $(foreach ext, \ html aux cp fn ky log pdf pg toc tp vr cps epub, \ $(wildcard doc/*.$(ext))) diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index dc46f891219..0375a041a39 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -19,7 +19,7 @@ DisableStartupPrompt=true OutputDir=.\ SourceDir=.\ -OutputBaseFilename=rust-{#CFG_VERSION_WIN}-install +OutputBaseFilename=rust-{#CFG_VERSION}-install DefaultDirName={pf32}\Rust Compression=lzma2/ultra |