diff -r 044b2b093492 src/wscript
--- a/src/wscript	Thu Jan 05 16:15:10 2012 +0100
+++ b/src/wscript	Fri Jan 06 19:01:10 2012 +0000
@@ -79,7 +79,8 @@
         module = bld.new_task_gen(features=['cxx', 'cxxstlib', 'ns3module'])
     else:
         module = bld.new_task_gen(features=['cxx', 'cxxshlib', 'ns3module'])
-    module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(module.path), name)
+    module.target = '%s/ns%s-%s-%s' % (bld.srcnode.relpath_gen(module.path), wutils.VERSION,
+                                       name, Options.options.build_profile)
     linkflags = []
     cxxflags = []
     ccflags = []
@@ -123,8 +124,8 @@
 
     module.env.append_value("INCLUDES", '#')
 
-    pcfilegen = bld(features='ns3pcfile')
-    pcfilegen.module = module
+    module.pcfilegen = bld(features='ns3pcfile')
+    module.pcfilegen.module = module
     
     return module
 
@@ -378,7 +379,8 @@
             cflags = cflags + self._cflags(dep) + self._cxxflags(dep) + \
                 self._defines(dep) + self._includes(dep)
             if dep.startswith('ns3-'):
-                requires.append("lib"+dep)
+                name = dep[4:]
+                requires.append("libns%s-%s-%s" % (wutils.VERSION, name, Options.options.build_profile))
         print >> outfile, """\
 prefix=%s
 libdir=%s
@@ -404,7 +406,7 @@
 @TaskGen.feature('ns3pcfile')
 @TaskGen.after_method('process_rule')
 def apply(self):
-    output_filename = 'lib%s.pc' % self.module.name
+    output_filename = 'lib%s.pc' % os.path.basename(self.module.target)
     output_node = self.path.find_or_declare(output_filename)
     assert output_node is not None, str(self)
     task = self.create_task('ns3pcfile')