From f7e3b01e23726a457a818781e5638d56ce1d9986 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Fri, 19 Jul 2013 18:35:42 +1000
Subject: [PATCH] Use cross-platform packaging version script in MinGW build

---
 tools/windows_packaging/mingw-env.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/windows_packaging/mingw-env.sh b/tools/windows_packaging/mingw-env.sh
index 37a575885f..28e5bf5fd3 100755
--- a/tools/windows_packaging/mingw-env.sh
+++ b/tools/windows_packaging/mingw-env.sh
@@ -26,8 +26,9 @@ BUILD_DIR=$BASE/build
 BUILD_CACHE_FILE=$BUILD_DIR/c4che/_cache.py
 TOOLS_DIR=$BASE/tools/windows_packaging
 
+. ../define_versions.sh
+
 APPNAME=`grep -m 1 '^APPNAME' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
-VERSION=`grep -m 1 '^VERSION' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
 
 # These are only relevant after a build
 if test -f $BUILD_CACHE_FILE
@@ -35,9 +36,9 @@ then
 	# Figure out the Build Type
 	if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
 		DEBUG=1
-		PACKAGE_DIR="$APPNAME-$VERSION-win32-dbg"
+		PACKAGE_DIR="$APPNAME-${version}-win32-dbg"
 	else
-		PACKAGE_DIR="$APPNAME-$VERSION-win32"
+		PACKAGE_DIR="$APPNAME-${version}-win32"
 	fi
 
 	if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then