From: Tim Mayberry <mojofunk@gmail.com>
Date: Mon, 17 Aug 2015 12:01:20 +0000 (+1000)
Subject: Remove duplicate code in wscript after merge
X-Git-Tag: 4.3~631
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=95c5b99efc922402df37e91b2ca3f7ac30f92050;hp=a26e27d9711aaf15eef96ed7588e8ee9cb0d7ec2;p=ardour.git

Remove duplicate code in wscript after merge
---

diff --git a/wscript b/wscript
index 7fb80461e9..25d4ebe00e 100644
--- a/wscript
+++ b/wscript
@@ -191,18 +191,12 @@ PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore'))
 VERSION = VERSION.replace('\'', '')
 PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '')
 
-
 if len (sys.argv) > 1 and sys.argv[1] == 'dist':
         if not 'APPNAME' in os.environ:
                 print "You must define APPNAME in the environment when running ./waf dist"
                 sys.exit (1)
         APPNAME = os.environ['APPNAME'];
 
-# It seems, that on msys2, with python3, it puts quotes around
-# the version number, which breaks the build.
-VERSION = VERSION.replace('\'', '')
-PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '')
-
 # Mandatory variables
 top = '.'
 out = 'build'