diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-09-09 13:07:20 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-09-09 13:33:29 -0700 |
| commit | 5206e79b926250c4547d83449cebbdeade586cd2 (patch) | |
| tree | 6d482fdaf474ad63d59ed06da781443b6146c329 | |
| parent | 3ebf25ee802877cd3940e08ed445a9999603c383 (diff) | |
| download | rust-5206e79b926250c4547d83449cebbdeade586cd2.tar.gz rust-5206e79b926250c4547d83449cebbdeade586cd2.zip | |
Fix naming of windows installer
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index a203dd8b639..4d86af37171 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -112,7 +112,7 @@ distcheck-tar-src: dist-tar-src ifdef CFG_ISCC -PKG_EXE = dist/$(PKG_NAME)-install.exe +PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe %.iss: $(S)src/etc/pkg/%.iss cp $< $@ diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 053fe34952c..08c28c4399b 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -1,6 +1,7 @@ #define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN") #define CFG_RELEASE GetEnv("CFG_RELEASE") #define CFG_PACKAGE_NAME GetEnv("CFG_PACKAGE_NAME") +#define CFG_BUILD GetEnv("CFG_BUILD") [Setup] @@ -20,7 +21,7 @@ DisableStartupPrompt=true OutputDir=.\dist\ SourceDir=.\ -OutputBaseFilename={#CFG_PACKAGE_NAME}-install +OutputBaseFilename={#CFG_PACKAGE_NAME}-{#CFG_BUILD} DefaultDirName={pf32}\Rust Compression=lzma2/ultra |