X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=71683ba84ea52dffdd8f0f05e241de019d867c9e;hb=309d78606f59617de0cfb1469b22111c846891ad;hp=bda8b3ccd1cc86a906aff5c5e4e5c30ec9af38e0;hpb=737789818bf8658d3b3f4444a273b2d44021e51a;p=senf.git

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index bda8b3c..71683ba 100644
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -178,9 +178,9 @@ def Glob(env, exclude=[], subdirs=[]):
                 for x in env.Glob("*.cc", strings=True) 
                 if x not in testSources and x not in exclude ]
     for subdir in subdirs:
-        testSources += glob.glob(os.path.join(subdir,"*.test.cc"))
+        testSources += env.Glob(os.path.join(subdir,"*.test.cc"), strings=True)
         sources += [ x 
-                     for x in env.Glob(os.path.join(subdir,"*.cc"))
+                     for x in env.Glob(os.path.join(subdir,"*.cc"), strings=True)
                      if x not in testSources and x not in exclude ]
     sources.sort()
     testSources.sort()
@@ -213,7 +213,9 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
         else:
             for dir, dirs, files in os.walk(senfdocdir):
                 tagfiles.extend([ os.path.join(dir,f) for f in files if f.endswith('.tag') ])
-                if dir.endswith('/doc') : dirs.remove('html')
+                if dir.endswith('/doc') : 
+                    try: dirs.remove('html')
+                    except ValueError: pass
                 for d in dirs: 
                     if d.startswith('.') : dirs.remove(d)