--- a/src/tap-bridge/wscript	Wed Sep 07 12:18:37 2011 -0700
+++ b/src/tap-bridge/wscript	Thu Sep 08 16:13:40 2011 +0100
@@ -15,7 +15,7 @@
                                      "needs threading support which is not available")
 
     if conf.env['ENABLE_TAP']:
-        blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant()))
+        blddir = os.path.abspath(os.path.join(conf.bldnode.abspath(), conf.variant))
         tapcreatordir = os.path.abspath(os.path.join(blddir, "src/tap-bridge"))
         conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)
     else:
@@ -34,7 +34,7 @@
         'model/tap-encode-decode.cc',
         'helper/tap-bridge-helper.cc',
         ]
-    headers = bld.new_task_gen('ns3header')
+    headers = bld.new_task_gen(features=['ns3header'])
     headers.module = 'tap-bridge'
     headers.source = [
         'model/tap-bridge.h',