--- nonpareil-0.78.old/SConstruct
+++ nonpareil-0.78/SConstruct
@@ -43,7 +43,7 @@
 
 		 PathOption ('prefix',
 			     'installation path prefix',
-			     '/usr/local'),
+			     '__META_PREFIX__'),
 
 		 # Don't use PathOption for other paths, because we don't
 		 # require the directories to preexist.
@@ -61,7 +61,7 @@
 
 		 BoolOption ('debug',
 			     help = 'compile for debugging',
-			     default = 1),
+			     default = 0),
 
 		 # Feature switches:
 
@@ -85,7 +85,9 @@
 # Cache options
 #-----------------------------------------------------------------------------
 
-env = Environment (options = opts)
+import os
+env = Environment(ENV = os.environ)
+
 opts.Update (env)
 opts.Save (conf_file, env)
 
--- nonpareil-0.78.old/src/asm.h
+++ nonpareil-0.78/src/asm.h
@@ -22,7 +22,7 @@
 
 extern int arch;
 
-int pass;
+extern int pass;
 extern int lineno;
 extern int errors;
 
==== end of patch ====