--- a/src/wscript	Fri Dec 07 10:06:29 2007 +0100
+++ b/src/wscript	Tue Dec 11 10:25:34 2007 +0100
@@ -48,17 +48,13 @@
     conf.sub_config('simulator')
 
     blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
-    conf.env['NS3_MODULE_PATH'] = [os.path.join(blddir, 'lib')]
+    conf.env['NS3_MODULE_PATH'] = [blddir]
     if Params.g_options.enable_rpath:
         conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
 
     ## Used to link the 'run-tests' program with all of ns-3 code
     conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]
 
-    if Params.g_options.enable_modules:
-        conf.env['NS3_ENABLED_MODULES'] = ['ns3-'+mod for mod in
-                                           Params.g_options.enable_modules.split(',')]
-
 
 def create_ns3_module(bld, name, dependencies=()):
     module = bld.create_obj('cpp', 'objects')