--- trunk/doc/SConstruct	2005/12/16 00:51:22	369
+++ trunk/doc/SConstruct	2006/02/02 04:21:02	485
@@ -1,34 +1,15 @@
-# top-level Scons configuration file for all documentation building
-
-import os
-
-#
-# ensure correct versions of python and scons
-
-EnsurePythonVersion(2,3)
-EnsureSConsVersion(0,96)
-
-#
-# retreive command-line arguments if any
-# these are passed through to SConscripts
+# Scons configuration file for documentation
 
 #
-# set and export esysroot
-
-esysroot = Dir('#../')
-
-Import('*')
+# set appropriate defaults for configuration variables
 
-Export(["esysroot"])
+esysroot=str(Dir('..').abspath)
+execfile(str(File(esysroot+"/scons/esys_options.py")))
 
 #
 # call appropriate SConscripts
 
 target_scripts = ['doxygen/SConscript',
-                  'epydoc/SConscript',
-                  'user/SConscript']
-
-target_scripts = ['doxygen/SConscript',
                   'epydoc/SConscript']
 
 SConscript(target_scripts, duplicate=0)