From e7a29b6b9b2f842314244c23c14d8f8f560904e1 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 17 Mar 2019 17:23:45 +0100
Subject: Upgrade to waf 2.0.15

---
 TaskGen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'TaskGen.py')

diff --git a/TaskGen.py b/TaskGen.py
index a74e643..532b7d5 100644
--- a/TaskGen.py
+++ b/TaskGen.py
@@ -74,7 +74,7 @@ class task_gen(object):
 		else:
 			self.bld = kw['bld']
 			self.env = self.bld.env.derive()
-			self.path = self.bld.path # emulate chdir when reading scripts
+			self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts
 
 			# Provide a unique index per folder
 			# This is part of a measure to prevent output file name collisions
@@ -727,7 +727,7 @@ def sequence_order(self):
 	self.bld.prev = self
 
 
-re_m4 = re.compile('@(\w+)@', re.M)
+re_m4 = re.compile(r'@(\w+)@', re.M)
 
 class subst_pc(Task.Task):
 	"""
-- 
cgit v1.2.1