From 15cbcbcc0374e6f39ee8d1a8325f25b69950b7c2 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 7 Jan 2014 16:51:37 -0800
Subject: [PATCH] mk: Fix the naming of the windows installer harder

CFG_VERSION includes a bunch of VCS info in it that is not a valid
filename. CFG_RELEASE is just the version number.
---
 Makefile.in          | 1 +
 src/etc/pkg/rust.iss | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 5e2059242e2..c2a562967d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -410,6 +410,7 @@ export CFG_SRC_DIR
 export CFG_BUILD_DIR
 export CFG_VERSION
 export CFG_VERSION_WIN
+export CFG_RELEASE
 export CFG_BUILD
 export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss
index 0375a041a39..1c46055fff7 100644
--- a/src/etc/pkg/rust.iss
+++ b/src/etc/pkg/rust.iss
@@ -1,5 +1,6 @@
 #define CFG_VERSION GetEnv("CFG_VERSION")
 #define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN")
+#define CFG_RELEASE GetEnv("CFG_RELEASE")
 
 [Setup]
 
@@ -19,7 +20,7 @@ DisableStartupPrompt=true
 
 OutputDir=.\
 SourceDir=.\
-OutputBaseFilename=rust-{#CFG_VERSION}-install
+OutputBaseFilename=rust-{#CFG_RELEASE}-install
 DefaultDirName={pf32}\Rust
 
 Compression=lzma2/ultra