From b0c1e0fddf2e67dec63ed4a19566f94bbdf48ddd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 27 Mar 2011 18:16:38 +0000 Subject: Update waf to use gnu_dirs tool and use dir vars more sanely. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3124 a436a847-0d15-0410-975c-d299462d15a1 --- waf | Bin 88126 -> 86049 bytes wscript | 8 ++------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/waf b/waf index 0a11b5ba..ecd9f370 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index 79f3bc05..b46f8bc7 100644 --- a/wscript +++ b/wscript @@ -90,12 +90,8 @@ def configure(conf): autowaf.define(conf, 'INGEN_BUILD_GUI', 1) if conf.is_defined('HAVE_JACK'): autowaf.define(conf, 'HAVE_JACK_MIDI', 1) - if conf.env['BUNDLE']: - autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIRNAME'], 'ingen')) - autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIRNAME']) - else: - autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIR'], 'ingen')) - autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIR']) + autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIR'], 'ingen')) + autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIR']) if Options.options.log_debug: autowaf.define(conf, 'RAUL_LOG_DEBUG', 1) -- cgit v1.2.1