Index: src/tap-bridge/wscript
===================================================================
--- src/tap-bridge/wscript.orig
+++ src/tap-bridge/wscript
@@ -49,7 +49,7 @@ def build(bld):
             'model/tap-encode-decode.cc',
             ]
 
-    module.env.append_value("DEFINES", "TAP_CREATOR=\"%s\"" % (tap_creator.target,))
+    module.env.append_value("DEFINES", "TAP_CREATOR=\"%s/ns%s/%s\"" % (bld.env['LIBEXECDIR'], bld.env['VERSION'], tap_creator.target,))
 
     if bld.env['ENABLE_EXAMPLES']:
         bld.recurse('examples')
Index: src/fd-net-device/wscript
===================================================================
--- src/fd-net-device/wscript.orig
+++ src/fd-net-device/wscript
@@ -131,7 +131,7 @@ def build(bld):
             ]
 
         module.env.append_value("DEFINES", 
-           "TAP_DEV_CREATOR=\"%s\"" % (creator.target,))
+           "TAP_DEV_CREATOR=\"%s/ns%s/%s\"" % (bld.env['LIBEXECDIR'], bld.env['VERSION'], creator.target,))
 
     if bld.env['ENABLE_EMU']:
         module.source.extend([
@@ -150,7 +150,7 @@ def build(bld):
         ]
 
         module.env.append_value("DEFINES", 
-           "RAW_SOCK_CREATOR=\"%s\"" % (creator.target,))
+           "RAW_SOCK_CREATOR=\"%s/ns%s/%s\"" % (bld.env['LIBEXECDIR'], bld.env['VERSION'], creator.target,))
 
     if bld.env['ENABLE_PLANETLAB']:
         module.source.extend([
@@ -169,7 +169,7 @@ def build(bld):
         ]
 
         module.env.append_value("DEFINES", 
-           "PLANETLAB_TAP_CREATOR=\"%s\"" % (creator.target,))
+           "PLANETLAB_TAP_CREATOR=\"%s/ns%s/%s\"" % (bld.env['LIBEXECDIR'], bld.env['VERSION'], creator.target,))
 
     if bld.env['ENABLE_EXAMPLES']:
         bld.recurse('examples')