From f432cf9c881b2e92bde3a282aff28e9420cd6c15 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 7 Nov 2011 03:49:36 +0000
Subject: Fix errors from last commit (oops).

---
 ext.wscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ext.wscript')

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/'),
-- 
cgit v1.2.1