From c076d135e7d17dc337d704dbf8a9c7718e5179ff Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 29 Nov 2009 23:12:45 +0000
Subject: [PATCH] nicer halibut scons code should make a proper builder out of
 this

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6001 212acab6-be3b-0410-9dea-997c60f758d6
---
 Docs/src/SConscript | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Docs/src/SConscript b/Docs/src/SConscript
index f10f8085..ffec0827 100644
--- a/Docs/src/SConscript
+++ b/Docs/src/SConscript
@@ -61,6 +61,7 @@ import re
 Import('halibut env build_chm')
 
 env.Append(ENV = {'PATH' : os.environ['PATH']})
+env['HALIBUT'] = halibut
 
 build_dir = Dir(GetBuildPath('.')).abspath
 
@@ -81,7 +82,10 @@ if build_chm:
 			Copy(build_dir, '${SOURCE.dir}/../style.css'),
 			Copy(build_dir, '${SOURCE.dir}/chmlink.js'),
 			Copy(build_dir, '${SOURCE.dir}/nsis.hhp'),
-			Action('cd "%s" && "%s" ${SOURCES.abspath}' % (build_dir, halibut[0].rfile())),
+			Action(
+				['${HALIBUT[0].abspath} ${SOURCES.abspath}'],
+				chdir = build_dir
+			),
 			hhc_action
 		]
 	)
@@ -110,7 +114,7 @@ else:
 	html_builder = Builder(
 		action = [
 			Copy(build_dir, '${SOURCE.dir}/../style.css'),
-			Action('cd "%s" && "%s" ${SOURCES.abspath}' % (build_dir, halibut[0].rfile()))
+			Action(['${HALIBUT[0].abspath} ${SOURCES.abspath}'], chdir = build_dir)
 		]
 	)