Skip to content

Commit b6602cb

Browse files
committed
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'.
2 parents 1f1838e + 21f9fa4 commit b6602cb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mk/clean.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ clean-misc:
4444
$(Q)rm -Rf $(DOCS)
4545
$(Q)rm -Rf $(GENERATED)
4646
$(Q)rm -Rf tmp/*
47-
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
47+
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist
4848
$(Q)rm -Rf $(foreach ext, \
4949
html aux cp fn ky log pdf pg toc tp vr cps epub, \
5050
$(wildcard doc/*.$(ext)))

src/etc/pkg/rust.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DisableStartupPrompt=true
1919

2020
OutputDir=.\
2121
SourceDir=.\
22-
OutputBaseFilename=rust-{#CFG_VERSION_WIN}-install
22+
OutputBaseFilename=rust-{#CFG_VERSION}-install
2323
DefaultDirName={pf32}\Rust
2424

2525
Compression=lzma2/ultra

0 commit comments

Comments
 (0)