--- a/src/wscript	Wed Jul 11 21:07:41 2012 -0700
+++ b/src/wscript	Thu Jul 12 12:35:31 2012 +0100
@@ -71,7 +71,6 @@
 def _add_test_code(module):
     pass
 
-
 def create_ns3_module(bld, name, dependencies=(), test=False):
     static = bool(bld.env.ENABLE_STATIC_NS3)
     # Create a separate library for this module.
@@ -79,8 +78,8 @@
         module = bld.new_task_gen(features=['cxx', 'cxxstlib', 'ns3module'])
     else:
         module = bld.new_task_gen(features=['cxx', 'cxxshlib', 'ns3module'])
-    module.target = '%s/ns%s-%s-%s' % (bld.srcnode.relpath_gen(module.path), wutils.VERSION,
-                                       name, bld.env['BUILD_PROFILE'])
+    module.target = '%s/ns%s-%s%s' % (bld.srcnode.relpath_gen(module.path), wutils.VERSION,
+                                       name, bld.env.BUILD_SUFFIX)
     linkflags = []
     cxxflags = []
     ccflags = []
@@ -375,7 +374,7 @@
         prefix = env.PREFIX
         includedir = Utils.subst_vars('${INCLUDEDIR}/%s%s' % (wutils.APPNAME, wutils.VERSION), env)
         libdir = env.LIBDIR
-        libs = self._self_libs(env, "%s%s-%s-%s" % (wutils.APPNAME, wutils.VERSION, name[4:], env['BUILD_PROFILE']), '${libdir}')
+        libs = self._self_libs(env, "%s%s-%s%s" % (wutils.APPNAME, wutils.VERSION, name[4:], env.BUILD_SUFFIX), '${libdir}')
         for dep in use:
             libs += self._lib(env, dep)
         for dep in env.LIBS:
@@ -387,7 +386,7 @@
                 self._defines(dep) + self._includes(dep)
             if dep.startswith('ns3-'):
                 dep_name = dep[4:]
-                requires.append("libns%s-%s-%s" % (wutils.VERSION, dep_name, env['BUILD_PROFILE']))
+                requires.append("libns%s-%s%s" % (wutils.VERSION, dep_name, env.BUILD_SUFFIX))
         print >> outfile, """\
 prefix=%s
 libdir=%s

--- a/wscript	Wed Jul 11 21:07:41 2012 -0700
+++ b/wscript	Thu Jul 12 12:35:31 2012 +0100
@@ -321,12 +321,18 @@
 
     env['PLATFORM'] = sys.platform
     env['BUILD_PROFILE'] = Options.options.build_profile
+    if Options.options.build_profile == "release":
+        env['BUILD_SUFFIX'] = ''
+    else:
+        env['BUILD_SUFFIX'] = '-'+Options.options.build_profile
+    
     env['APPNAME'] = wutils.APPNAME
     env['VERSION'] = wutils.VERSION
 
     if conf.env['CXX_NAME'] in ['gcc', 'icc']:
         if Options.options.build_profile == 'release': 
             env.append_value('CXXFLAGS', '-fomit-frame-pointer') 
+        if Options.options.build_profile == 'optimized': 
             if conf.check_compilation_flag('-march=native'):
                 env.append_value('CXXFLAGS', '-march=native') 
 
@@ -576,7 +582,7 @@
     program.is_ns3_program = True
     program.module_deps = list()
     program.name = name
-    program.target = "%s%s-%s-%s" % (wutils.APPNAME, wutils.VERSION, name, bld.env.BUILD_PROFILE)
+    program.target = "%s%s-%s%s" % (wutils.APPNAME, wutils.VERSION, name, bld.env.BUILD_SUFFIX)
 
     if bld.env['ENABLE_SUDO']:
         program.create_task("SuidBuild")
@@ -590,7 +596,7 @@
 
     program.is_ns3_program = True
     program.name = name
-    program.target = "%s%s-%s-%s" % (wutils.APPNAME, wutils.VERSION, name, bld.env.BUILD_PROFILE)
+    program.target = "%s%s-%s%s" % (wutils.APPNAME, wutils.VERSION, name, bld.env.BUILD_SUFFIX)
     # Each of the modules this program depends on has its own library.
     program.ns3_module_dependencies = ['ns3-'+dep for dep in dependencies]
     program.includes = "# #/.."
@@ -765,8 +771,8 @@
                 # Add this program to the list if all of its
                 # dependencies will be built.
                 if program_built:
-                    object_name = "%s%s-%s-%s" % (wutils.APPNAME, wutils.VERSION, 
-                                                  obj.name, bld.env.BUILD_PROFILE)
+                    object_name = "%s%s-%s%s" % (wutils.APPNAME, wutils.VERSION, 
+                                                  obj.name, bld.env.BUILD_SUFFIX)
                     bld.env.append_value('NS3_RUNNABLE_PROGRAMS', object_name)
 
             # disable the modules themselves