From 183c3faafd0d86473817de60de8598b8d9fc0c78 Mon Sep 17 00:00:00 2001 From: Adrian Knoth Date: Sat, 17 Mar 2012 23:46:18 +0100 Subject: [PATCH] wscript: Make ADDON_DIR also a conf env variable In new waf, defines are no longer added to the conf environment, they only end up in config.h. Consequently, they can't be referenced later from the wscript. So explicitly put ADDON_DIR to conf.env. --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 988d84c1..3951e838 100644 --- a/wscript +++ b/wscript @@ -203,7 +203,8 @@ def configure(conf): conf.define('CLIENT_NUM', Options.options.clients) conf.define('PORT_NUM_FOR_CLIENT', Options.options.application_ports) - conf.define('ADDON_DIR', os.path.normpath(os.path.join(conf.env['LIBDIR'], 'jack'))) + conf.env['ADDON_DIR'] = os.path.normpath(os.path.join(conf.env['LIBDIR'], 'jack')) + conf.define('ADDON_DIR', conf.env['ADDON_DIR']) conf.define('JACK_LOCATION', os.path.normpath(os.path.join(conf.env['PREFIX'], 'bin'))) conf.define('USE_POSIX_SHM', 1) conf.define('JACKMP', 1)