diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 16:49:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 16:49:10 +0000 |
| commit | 21e0eb0db9fd47aa24ce2c3606a5c582b92b4fb7 (patch) | |
| tree | 271f714ba27ad3933d27b6bacfb45ef1aec4ffe7 /SConstruct | |
| parent | 894e4500a0da1d9044975631ec5b7c3baed7ef63 (diff) | |
use DIST_LIBDIR to allow override of LIBDIR ; gcc4.4 patches from debian (once again, those guys don't send upstream, they think their own bug DB is where this stuff belongs, sigh ... thanks adi for the notice)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5429 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index fcd575dcef..24fc84f096 100644 --- a/SConstruct +++ b/SConstruct @@ -51,7 +51,7 @@ opts.AddOptions( PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), BoolOption('SURFACES', 'Build support for control surfaces', 1), BoolOption('WIIMOTE', 'Build the wiimote control surface', 0), - ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'), + ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''), BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), @@ -742,10 +742,13 @@ if env['FPU_OPTIMIZATION']: # handle x86/x86_64 libdir properly -if env['DIST_TARGET'] == 'x86_64': - env['LIBDIR']='lib64' +if env['DIST_LIBDIR'] == '': + if env['DIST_TARGET'] == 'x86_64': + env['LIBDIR']='lib64' + else: + env['LIBDIR']='lib' else: - env['LIBDIR']='lib' + env['LIBDIR'] = env['DIST_LIBDIR'] # # no VST on x86_64 |