--- glob2-0.9.4.4-orig/SConstruct	2007-09-10 00:17:39.000000000 +0200
+++ glob2-0.9.4.4/SConstruct	2007-09-14 03:23:22.000000000 +0200
@@ -5,4 +5,5 @@
     opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin")
     opts.Add("DATADIR", "Directory where data will be put, set to the same as INSTALLDIR", "/usr/local/share")
+    opts.Add("FINKPREFIX", "Fink directory", "/sw")
     opts.Add(BoolOption("release", "Build for release", 0))
     opts.Add(BoolOption("profile", "Build with profiling on", 0))
@@ -25,6 +26,11 @@
     Help(opts.GenerateHelpText(env))
     opts.Update(env)
     opts.Save("options_cache.py", env)
+
+    env.Append(CPPPATH = [ env["FINKPREFIX"] + "/include" ])
+    env.Append(CPPPATH = [ "/usr/X11R6/include" ])
+    env.Append(LIBPATH = [ env["FINKPREFIX"] + "/lib"])
+    env.Append(LIBPATH = [ "/usr/X11R6/lib" ])
 
 
 class Configuration:
@@ -178,7 +178,7 @@
               action='store',
               metavar='portaudio',
               help='should portaudio be used')
-    env = Environment()
+    env = Environment(ENV = {'PATH' : os.environ['PATH']})
     try:
         env.Clone()
     except AttributeError:
--- glob2-0.9.4.4-orig/scons/dmg.py	2007-09-10 00:17:39.000000000 +0200
+++ glob2-0.9.4.4/scons/dmg.py	2007-09-14 03:23:22.000000000 +0200
@@ -2,7 +2,7 @@
 def create_dmg( target, source, env) :
 	volume = str(target[0]).replace('.dmg', '')
 #really need to rewrite this later to use the variables and not be hardcoded
-	os.system( "rm Glob2-0.9.3.dmg" )
+	os.system( "rm -f Glob2-*.dmg" )
 	os.system( "rm -rf DMG" )
 	os.system( "mkdir DMG" )
 	os.system( "cp -r %s DMG"%source )