X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fwindows_packaging%2Fmingw-env.sh;h=983e6d0b9b382091a7f30d0270e515fbd7b5ec75;hb=658bb3ccd43658de18fbd43cd91a8e66650e27a7;hp=616f89af5e05ef3f843d9946f63a4ed077c2bdef;hpb=5cf1f7f3b28abd36f9390014016def94f4e1468d;p=ardour.git

diff --git a/tools/windows_packaging/mingw-env.sh b/tools/windows_packaging/mingw-env.sh
index 616f89af5e..983e6d0b9b 100755
--- a/tools/windows_packaging/mingw-env.sh
+++ b/tools/windows_packaging/mingw-env.sh
@@ -26,19 +26,18 @@ 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"`
 
 # These are only relevant after a build
 if test -f $BUILD_CACHE_FILE
 then
+        . ../define_versions.sh
+
 	# Figure out the Build Type
-	if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
-		DEBUG=1
-		PACKAGE_DIR="$APPNAME-${version}-win32-dbg"
+	if [ x$DEBUG = xT ]; then
+		PACKAGE_DIR="$APPNAME-${release_version}-win32-dbg"
 	else
-		PACKAGE_DIR="$APPNAME-${version}-win32"
+		PACKAGE_DIR="$APPNAME-${release_version}-win32"
 	fi
 
 	if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
@@ -47,6 +46,3 @@ then
 
 	ARDOUR_DATA_DIR=$PACKAGE_DIR/share/ardour3
 fi
-
-# put this somewhere better...
-VIRT_IMAGE_PATH=$HOME/Data/virt-images/winxp.raw