parameterize the version number used to define the config directory name

This commit is contained in:
Paul Davis 2014-07-16 08:15:18 -04:00
parent b69870dfe6
commit 692f69ba14
2 changed files with 3 additions and 2 deletions

View File

@ -40,7 +40,7 @@ const char* const ladspa_dir_name = X_("ladspa");
const char* const panner_dir_name = X_("panners");
const char* const backend_dir_name = X_("backends");
char config_dir_name[] = X_(PROGRAM_NAME "3");
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

@ -48,7 +48,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
# because if it is, it breaks waf somehow.
#
VERSION = V.encode ('ascii', 'ignore')
APPNAME = 'Ardour' + MAJOR
PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore')
# Mandatory variables
top = '.'
@ -380,6 +380,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)