From 2ad8448cc7ebc0ea6db14ddeac58f09f76ff3b20 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 24 Apr 2005 17:23:37 +0000
Subject: [PATCH] use our default environment for building halibut

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4000 212acab6-be3b-0410-9dea-997c60f758d6
---
 Docs/src/bin/halibut/SConscript | 2 +-
 SConstruct                      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Docs/src/bin/halibut/SConscript b/Docs/src/bin/halibut/SConscript
index 3afc8daa..5c606cac 100644
--- a/Docs/src/bin/halibut/SConscript
+++ b/Docs/src/bin/halibut/SConscript
@@ -19,7 +19,7 @@ files = Split("""
 	version.c
 """)
 
-env = Environment()
+Import('env')
 
 halibut = env.Program(target, files)
 
diff --git a/SConstruct b/SConstruct
index 2ce91da8..940740d6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -246,7 +246,8 @@ for util in utils:
 halibut = defenv.SConscript(
 	dirs = 'Docs/src/bin/halibut',
 	build_dir = '$BUILD_PREFIX/halibut',
-	duplicate = 0
+	duplicate = 0,
+	exports = {'env' : defenv.Copy()}
 )
 
 defenv.SConscript(