3 --- SConstruct.orig 2010-01-23 17:12:22.000000000 +0000
5 @@ -39,7 +39,7 @@ opts.AddOptions(
6 BoolOption('OLDFONTS', 'Old school font sizes', 0),
7 BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
8 BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0),
9 - PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
10 + PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/', PathOption.PathAccept),
11 EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
12 BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
13 BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0),
14 @@ -49,6 +49,8 @@ opts.AddOptions(
15 BoolOption('LIBLO', 'Compile with support for liblo library', 1),
16 BoolOption('NLS', 'Set to turn on i18n support', 1),
17 PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
18 + PathOption('SYSCONFDIR', '(where to find config files)', None, PathOption.PathAccept),
19 + PathOption('SYSCONFEXDIR', '(where to install example config files)', None, PathOption.PathAccept),
20 BoolOption('SURFACES', 'Build support for control surfaces', 1),
21 BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
22 ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''),
23 @@ -1240,12 +1242,21 @@ subst_dict['%INSTALL_PREFIX%'] = install
24 subst_dict['%FINAL_PREFIX%'] = final_prefix;
25 subst_dict['%PREFIX%'] = final_prefix;
27 -if env['PREFIX'] == '/usr':
28 - final_config_prefix = '/etc'
29 +if env['SYSCONFDIR']:
30 + final_config_prefix = env['SYSCONFDIR']
32 - final_config_prefix = env['PREFIX'] + '/etc'
33 + final_config_prefix = env['PREFIX'] + '/etc/ardour2'
35 -config_prefix = '$DESTDIR' + final_config_prefix
36 +if env['SYSCONFEXDIR']:
38 + config_prefix = '$DESTDIR' + env['SYSCONFEXDIR']
40 + config_prefix = env['SYSCONFEXDIR']
43 + config_prefix = '$DESTDIR' + env['PREFIX'] + '/share/examples/ardour'
45 + config_prefix = env['PREFIX'] + '/share/examples/ardour'
48 # everybody needs this
49 @@ -1349,7 +1360,7 @@ remove_ardour = env.Command ('frobnicato
50 Delete ('$PREFIX/share/ardour2')])
52 env.Alias('revision', the_revision)
53 -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))
54 +env.Alias('install', env.Install(config_prefix, 'ardour_system.rc'))
55 env.Alias('uninstall', remove_ardour)