From 183dcf0f6ccd4ee5d36a13641f3e2df6a36a9f65 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 15 Dec 2010 22:59:04 +0000
Subject: Update for waf 1.6.

---
 core.lv2/lv2core.pc.in |  8 ++++----
 core.lv2/wscript       |  8 ++++----
 wscript                | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core.lv2/lv2core.pc.in b/core.lv2/lv2core.pc.in
index 5c06f73..a511a81 100644
--- a/core.lv2/lv2core.pc.in
+++ b/core.lv2/lv2core.pc.in
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
 
 Name: lv2core
 Version: @LV2CORE_VERSION@
diff --git a/core.lv2/wscript b/core.lv2/wscript
index 68fdd5f..88b8365 100644
--- a/core.lv2/wscript
+++ b/core.lv2/wscript
@@ -11,10 +11,10 @@ APPNAME = 'lv2core'
 VERSION = LV2CORE_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
 	opt.add_option('--bundle-only', action='store_true', default=False, dest='bundle_only',
 			help="Only install LV2 bundle (not header or pkg-config file)")
 	autowaf.set_options(opt)
@@ -42,7 +42,7 @@ def build(bld):
 
 	# lv2config
 	bld.install_files('${BINDIR}', 'lv2config', chmod=0755)
-	
+
 def dist():
         import Scripting
         Scripting.g_gz = 'gz'
diff --git a/wscript b/wscript
index 0b414d0..0e2a1e6 100644
--- a/wscript
+++ b/wscript
@@ -11,10 +11,10 @@ APPNAME = 'lv2plug.in'
 VERSION = LV2EXT_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
 	autowaf.set_options(opt)
 	opt.tool_options('compiler_cc')
 	opt.tool_options('compiler_cxx')
@@ -28,15 +28,15 @@ def configure(conf):
 	conf.check_tool('compiler_cc')
 	conf.check_tool('compiler_cxx')
 	conf.env.append_value('CCFLAGS', '-std=c99')
-	pat = conf.env['shlib_PATTERN']
+	pat = conf.env['cshlib_PATTERN']
 	ext = pat[pat.rfind('.'):]
-	conf.env.append_value('shlib_EXTENSION', ext)
-	
+	conf.env.append_value('cshlib_EXTENSION', ext)
+
 def build_plugin(bld, lang, name):
-	ext = bld.env['shlib_EXTENSION'][0]
+	ext = bld.env['cshlib_EXTENSION'][0]
 
 	penv = bld.env.copy()
-	penv['shlib_PATTERN'] = '%s' + ext
+	penv['cshlib_PATTERN'] = '%s' + ext
 
 	# Library
 	ext = 'c'
@@ -91,7 +91,7 @@ def build(bld):
 	'''
 	for e in ext.split():
 		build_extension(bld, e, 'ext')
-	
+
 	extensions = '''
 		ui
 		units
-- 
cgit v1.2.1