diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 1d87d395e7..f85bd7e4f8 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,9 +8,9 @@ import TaskGen import re # Version of this package (even if built as a child) -MAJOR = '1' +MAJOR = '3' MINOR = '0' -MICRO = '2' +MICRO = '0' GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) # Variables for 'waf dist' @@ -250,7 +250,7 @@ def build(bld): libgtkmm2ext libtaglib''' obj.cflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags = ['-DPACKAGE="gtk2_ardour"'] - obj.cxxflags += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"'] + obj.cxxflags += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"'] obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"'] obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"'] obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"'] diff --git a/wscript b/wscript index f2fa3acd18..f7fe4adee0 100644 --- a/wscript +++ b/wscript @@ -372,6 +372,7 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): create_stored_revision() + conf.env['VERSION'] = VERSION autowaf.set_recursive() autowaf.configure(conf)