diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-16 08:15:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-16 08:15:18 -0400 |
| commit | 692f69ba146af36d614727df0f9e1bf3c45245e8 (patch) | |
| tree | 4baae0cd1265be9ddf366dca51ec0f3f9b5d1643 | |
| parent | b69870dfe64388e76d60b8f2224dc53192c3153d (diff) | |
parameterize the version number used to define the config directory name
| -rw-r--r-- | libs/ardour/directory_names.cc | 2 | ||||
| -rw-r--r-- | wscript | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc index c368f8eaaf..43238ba45a 100644 --- a/libs/ardour/directory_names.cc +++ b/libs/ardour/directory_names.cc @@ -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 @@ -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) |