diff options
author | David Robillard <d@drobilla.net> | 2011-11-07 03:49:36 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-11-07 03:49:36 +0000 |
commit | f432cf9c881b2e92bde3a282aff28e9420cd6c15 (patch) | |
tree | a1faa260ddeeb8524b2261bfb2e9434b2e67b52c | |
parent | 717a6c7e263a0a21e62a48e5a73971dc2150e892 (diff) | |
download | lv2-f432cf9c881b2e92bde3a282aff28e9420cd6c15.tar.xz |
Fix errors from last commit (oops).
-rw-r--r-- | ext.wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext.wscript b/ext.wscript index 8595ae1..2004a97 100644 --- a/ext.wscript +++ b/ext.wscript @@ -32,11 +32,11 @@ except: m.parse(os.path.join(dir, name + '.ttl'), format='n3') info = type('lv2extinfo', (object,), { - 'NAME' : name, + 'NAME' : str(name), 'MINOR' : int(m.value(spec, lv2.minorVersion, None)), 'MICRO' : int(m.value(spec, lv2.microVersion, None)), 'URI' : str(spec), - 'PKGNAME' : 'lv2-' + spec.replace('http://', '').replace('/', '-') + 'PKGNAME' : 'lv2-' + spec.replace('http://', '').replace('/', '-'), 'SHORTDESC' : str(m.value(spec, doap.shortdesc, None))}) except: @@ -79,7 +79,7 @@ def configure(conf): autowaf.display_msg(conf, 'LV2 bundle directory', conf.env['LV2DIR']) autowaf.display_msg(conf, 'URI', info.URI) autowaf.display_msg(conf, 'Version', VERSION) - autowaf.display_msg(conf, 'Pkgconfig name', info.PKGCONFIG_NAME) + autowaf.display_msg(conf, 'Pkgconfig name', info.PKGNAME) print('') def build(bld): @@ -94,7 +94,7 @@ def build(bld): # Pkgconfig file obj = bld(features = 'subst', source = 'ext.pc.in', - target = info.PKGCONFIG_NAME + '.pc', + target = info.NAME + '.pc', install_path = '${LIBDIR}/pkgconfig', INCLUDEDIR = bld.env['INCLUDEDIR'], INCLUDE_PATH = uri.replace('http://', 'lv2/'), |