diff options
| author | Adrian Knoth <adi@drcomp.erfurt.thur.de> | 2012-02-10 21:55:03 +0100 |
|---|---|---|
| committer | Adrian Knoth <adi@drcomp.erfurt.thur.de> | 2012-02-12 14:15:23 +0100 |
| commit | a534162500fe8defa28a56eecf0e53876c93a762 (patch) | |
| tree | 3d5be73f868f8435e6f821e15c2a4b6cb0807181 /dbus | |
| parent | 662c55669d74c89f9df4402338bfdc559c0364eb (diff) | |
| download | jack2-a534162500fe8defa28a56eecf0e53876c93a762.tar.gz | |
wscript: Fix DBUS service file generation
New waf syntax for a subst build.
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/wscript | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dbus/wscript b/dbus/wscript index d771f60d..d761e4cb 100644 --- a/dbus/wscript +++ b/dbus/wscript @@ -29,8 +29,6 @@ def configure(conf): else: conf.env['DBUS_SERVICES_DIR'] = os.path.normpath(conf.env['PREFIX'] + '/share/dbus-1/services') - conf.check_tool('misc') - conf.check(header_name='expat.h', define_name="HAVE_EXPAT") if conf.is_defined('HAVE_EXPAT'): @@ -75,10 +73,9 @@ def build(bld): obj.target = 'jackdbus' # process org.jackaudio.service.in -> org.jackaudio.service - import misc - obj = bld.new_task_gen('subst') - obj.source = 'org.jackaudio.service.in' - obj.target = 'org.jackaudio.service' - obj.dict = {'BINDIR': bld.env['PREFIX'] + '/bin'} - obj.install_path = '${DBUS_SERVICES_DIR}/' - obj.fun = misc.subst_func + obj = bld( + features = 'subst', + source = 'org.jackaudio.service.in', + target = 'org.jackaudio.service', + install_path = '${DBUS_SERVICES_DIR}/', + BINDIR = bld.env['PREFIX'] + '/bin') |