diff options
| author | David Robillard <d@drobilla.net> | 2011-03-27 18:16:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-03-27 18:16:38 +0000 |
| commit | b0c1e0fddf2e67dec63ed4a19566f94bbdf48ddd (patch) | |
| tree | 4e98625c56194bdc72990d04a76b87c0b51dfc91 | |
| parent | f85c13eda15c51ca628823ec8b9d22d697c6858b (diff) | |
| download | ingen-b0c1e0fddf2e67dec63ed4a19566f94bbdf48ddd.tar.gz ingen-b0c1e0fddf2e67dec63ed4a19566f94bbdf48ddd.tar.bz2 ingen-b0c1e0fddf2e67dec63ed4a19566f94bbdf48ddd.zip | |
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
| -rwxr-xr-x | waf | bin | 88126 -> 86049 bytes | |||
| -rw-r--r-- | wscript | 8 |
2 files changed, 2 insertions, 6 deletions
| Binary files differ @@ -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) |