Clean up DOXYGEN build var setting

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1485 270642c3-0616-0410-b53a-bc976706d245

diff --git a/doclib/SConscript b/doclib/SConscript
index 22a2645..9dc26c2 100644 (file)
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -264,7 +264,6 @@ env.SetDefault(
 
 env.Append( ENV = {
     'TODAY' : str(datetime.date.today()),
-    'DOXYGEN' : str(env.File(env['DOXYGEN'])),
 })
 
 env.PhonyTarget('linklint', [], [

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index 13f515e..8beeabf 100644 (file)
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -46,7 +46,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "
                  'LIBDIR'          : env.Dir('#/site_scons/lib').abspath,
                  'output_dir'      : '$OUTPUT_DIRECTORY',
                  'html_dir'        : 'html',
-                 'html'            : 'NO' }
+                 'html'            : 'NO',
+                 'DOXYGEN'         : '$DOXYGEN' }
         denv.update(kw)
         return { 'DOXYENV'         : denv,
                  'MODULE'          : module,

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index c9baf1d..2c88b64 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -258,7 +258,8 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
                                      'tagfiles'   : '$TAGFILES',
                                      'output_dir' : 'doc',
                                      'html_dir'   : 'html',
-                                     'html'       : 'YES' },
+                                     'html'       : 'YES',
+                                     'DOXYGEN'    : '$DOXYGEN' },
                       TAGFILES   = tagfiles, 
                       DOCLIBDIR  = libdir,
                       DOXYGENCOM = "$DOCLIBDIR/doxygen.sh $DOXYOPTS $SOURCE")

diff --git a/site_scons/site_tools/Doxygen.py b/site_scons/site_tools/Doxygen.py
index e79cfc9..842e441 100644 (file)
--- a/site_scons/site_tools/Doxygen.py
+++ b/site_scons/site_tools/Doxygen.py
@@ -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):