--- a/ns3waf/__init__.py	Mon Apr 11 13:40:59 2011 +0200
+++ b/ns3waf/__init__.py	Mon Apr 11 15:27:00 2011 +0200
@@ -305,9 +305,9 @@
 def _cxxflags(bld, dep):
     return bld.env['CXXFLAGS_%s' % dep]
 def _defines(bld, dep):
-    return ['-D' + define for define in bld.env['DEFINES_%s' % dep]]
+    return [bld.env['DEFINES_ST'] % define for define in bld.env['DEFINES_%s' % dep]]
 def _includes(bld, dep):
-    return ['-I' + include for include in bld.env['INCLUDES_%s' % dep]]
+    return [bld.env['INCLUDES_ST'] % include for include in bld.env['INCLUDES_%s' % dep]]
 
 def _self_lib(bld, name, libdir):
     if bld.env['NS3_ENABLE_STATIC']:
@@ -331,7 +331,7 @@
     libs = _self_lib(bld, name, '%{libdir}')
     for dep in use:
         libs = libs + _lib(bld,dep)
-    cflags = ['-I${includedir}']
+    cflags = [bld.env['INCLUDES_ST'] % '${includedir}']
     for dep in use:
         cflags = cflags + _cflags(bld, dep) + _cxxflags(bld, dep) + \
             _defines(bld, dep) + _includes(bld, dep)