Index: /trunk/libffado/external/dbus/SConscript
===================================================================
--- /trunk/libffado/external/dbus/SConscript (revision 565)
+++ /trunk/libffado/external/dbus/SConscript (revision 566)
@@ -8,5 +8,16 @@
 Import( 'env' )
 #dbus_env = env.Copy()
-dbus_env = Environment( ENV = { 'PATH' : os.environ['PATH'], 'PKG_CONFIG_PATH' : os.environ['PKG_CONFIG_PATH'] } )
+buildenv={}
+if os.environ.has_key('PATH'):
+	buildenv['PATH']=os.environ['PATH']
+else:
+	buildenv['PATH']=''
+
+if os.environ.has_key('PKG_CONFIG_PATH'):
+	buildenv['PKG_CONFIG_PATH']=os.environ['PKG_CONFIG_PATH']
+else:
+	buildenv['PKG_CONFIG_PATH']=''
+
+dbus_env = Environment( ENV = buildenv )
 
 CacheDir( 'cache/objects' )
Index: /trunk/libffado/SConstruct
===================================================================
--- /trunk/libffado/SConstruct (revision 565)
+++ /trunk/libffado/SConstruct (revision 566)
@@ -43,5 +43,16 @@
 
 ## Load the builders in config
-env = Environment( tools=['default','scanreplace','pyuic'], toolpath=['admin'], ENV = { 'PATH' : os.environ['PATH'], 'PKG_CONFIG_PATH' : os.environ['PKG_CONFIG_PATH'] }, options=opts )
+buildenv={}
+if os.environ.has_key('PATH'):
+	buildenv['PATH']=os.environ['PATH']
+else:
+	buildenv['PATH']=''
+
+if os.environ.has_key('PKG_CONFIG_PATH'):
+	buildenv['PKG_CONFIG_PATH']=os.environ['PKG_CONFIG_PATH']
+else:
+	buildenv['PKG_CONFIG_PATH']=''
+
+env = Environment( tools=['default','scanreplace','pyuic'], toolpath=['admin'], ENV = buildenv, options=opts )
 
 Help( """