Update waf to use gnu_dirs tool and use dir vars more sanely.

git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3124 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 3 insertions, 2 deletions

diff --git a/waf b/waf
index 0a11b5b..ecd9f37 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index a153541..03440fc 100644
--- a/wscript
+++ b/wscript
@@ -130,10 +130,11 @@ def configure(conf):
         elif Options.platform == 'win32':
             Options.options.default_lv2_path = 'C:\\Program Files\\LV2'
         else:
+            libdirname = os.path.basename(conf.env['LIBDIR'])
             Options.options.default_lv2_path = slv2_path_sep.join([
                     '~/.lv2',
-                    '/usr/%s/lv2' % conf.env['LIBDIRNAME'],
-                    '/usr/local/%s/lv2' % conf.env['LIBDIRNAME']])
+                    '/usr/%s/lv2' % libdirname,
+                    '/usr/local/%s/lv2' % libdirname])
 
     autowaf.define(conf, 'SLV2_DEFAULT_LV2_PATH', Options.options.default_lv2_path)