parameterize the version number used to define the config directory name

Conflicts:
	libs/ardour/directory_names.cc
	wscript
This commit is contained in:
Paul Davis 2014-07-16 08:15:18 -04:00
parent 9b240978a7
commit ce5e0dcaae
2 changed files with 7 additions and 0 deletions

View file

@ -45,6 +45,11 @@ const char* const plugins_dir_name = X_("plugins");
const char* const externals_dir_name = X_("externals");
char config_dir_name[] = X_(PROGRAM_NAME);
/* Use this to get a versioned config directory name
char config_dir_name[] = X_(PROGRAM_NAME PROGRAM_VERSION);
*/
#if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
const char* const user_config_dir_name = config_dir_name;
#else

View file

@ -49,6 +49,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
#
VERSION = V.encode ('ascii', 'ignore')
APPNAME = 'Tracks'
PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore')
# Mandatory variables
top = '.'
@ -387,6 +388,7 @@ def set_compiler_flags (conf,opt):
compiler_flags.append('-DENABLE_NLS')
compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"')
if opt.debug:
conf.env.append_value('CFLAGS', debug_flags)