From 3f0107c995c04e296fbf26489f911af05ee09d74 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 19 May 2013 23:30:43 +0000
Subject: [PATCH] fixed version numbering - always use what command line tells
 you to use (not 3.0.0)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6360 212acab6-be3b-0410-9dea-997c60f758d6
---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 63bf14ba..e6203579 100644
--- a/SConstruct
+++ b/SConstruct
@@ -255,7 +255,7 @@ if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv
 if defenv.has_key('VER_PACKED'):
 	f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED'])
 
-if defenv.has_key('VER_MAJOR'):
+if defenv.has_key('VER_MAJOR') and not defenv.has_key('VERSION'):
 	defenv['VERSION'] = defenv['VER_MAJOR']
 	if defenv.has_key('VER_MINOR'):
 		defenv['VERSION'] += '.' + defenv['VER_MINOR']