--- tools/SConscript.orig	Thu Jun 22 19:15:05 2006
+++ tools/SConscript	Fri Jun 15 00:09:36 2007
@@ -2,9 +2,14 @@
 
 import glob
 
-env = Environment(CPPPATH=['../..'],
-                  CXXFILESUFFIX = ".cpp",
-                  YACCFLAGS=['-d', '--no-lines'])
+Import('conf_env')
+
+env = conf_env.Copy()
+env.Append(CPPPATH=['../..'])
+env.Replace(CXXFILESUFFIX = ".cpp")
+env.Replace(YACCFLAGS = ['-d', '--no-lines'])
+env.Replace(YACC = 'bison')
+
 miniswig = env.Program('miniswig/miniswig',
                        ['miniswig/parser.yy',
                         'miniswig/lexer.ll',