X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsite_tools%2FDoxygen.py;h=842e4412342d76741e09c9758a98c387721d2be8;hb=566fb4271b2aff5aa07943707f770b2a84c2738b;hp=5b045160f625644a9b28c8ec021c34acd3652ab4;hpb=737789818bf8658d3b3f4444a273b2d44021e51a;p=senf.git

diff --git a/site_scons/site_tools/Doxygen.py b/site_scons/site_tools/Doxygen.py
index 5b04516..842e441 100644
--- a/site_scons/site_tools/Doxygen.py
+++ b/site_scons/site_tools/Doxygen.py
@@ -189,11 +189,11 @@ class DoxyfileParser:
       if len(value) != 1:
          raise ValueError,"Invalid argument to @INCLUDE"
       
-      for d in [ self._dir ] + self._include_path:
+      for d in [ self._dir.get_path() ] + self._include_path:
          p = os.path.join(d,value[0])
          if os.path.exists(p):
             self._items.setdefault('@INCLUDE',[]).append(p)
-            parser = DoxyfileParser(self._node.File(p), self._env, self._include_path, self._items)
+            parser = DoxyfileParser(self._node.dir.File(p), self._env, self._include_path, self._items)
             parser.parse()
             return
 
@@ -393,7 +393,8 @@ def generate(env):
    })
 
    env.SetDefault(
-      DOXYGENCOM = 'cd ${SOURCE.dir} && doxygen ${SOURCE.file}'
+      DOXYGEN = "doxygen",
+      DOXYGENCOM = 'cd ${SOURCE.dir} && ${DOXYGEN} ${SOURCE.file}'
    )
 
 def exists(env):