diff --git a/.gitignore b/.gitignore
index 76ce801066d07693ffb20fa76df7423b525efdd8..cc1ac4b5bb96df40a42270f50ba4bc406097db63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,4 @@ test/MemorySpace.exe
 test/Options.exe
 test/Range.exe
 scons_build
-
-
+*.exe
diff --git a/SConscript b/SConscript
index 5931273aaa159125ec920d4295d62d4814eafa24..9558bf124d8339a5cd2561491b9d3f83d941910c 100644
--- a/SConscript
+++ b/SConscript
@@ -2,23 +2,21 @@ import shutil
 import os
 import tarfile
 
-(sysname, nodename, release, version, machine)=os.uname()
-
 Import('env')
 
 # build security transforms
 irdbenv=env.Clone(); 
 
-zipr=SConscript("src/SConscript", variant_dir='scons_build/zipr')
+zipr=SConscript("src/SConscript")
+
+pedi = Command( target = "./zipr-testoutput",
+                source = zipr,
+                action = "echo zipr; cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
 
-if sysname  != "SunOS":
-	SConscript("test/SConscript")
+ret=[zipr]
+if Dir('.').abspath == Dir('#.').abspath:
+	ret=pedi+zipr
 
-pedi = Command( target = "./testoutput",
-                source = "./SConscript",
-                action = "cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
 
-Depends(pedi,zipr)
-Default( pedi )
-ret=pedi+zipr
+Default(ret)
 Return('ret')
diff --git a/SConstruct b/SConstruct
index f6d20b0f1895fcd5f4059155b345547e2bb6767a..cf51ffc05be8adc5ecc89bf788abd52bba5097d3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,5 +56,5 @@ else:
 
 
 Export('env')
-SConscript("SConscript", variant_dir='build')
+SConscript("SConscript")