From d2f099430bd620bd8ac6f0264c61eb66c11a0748 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 2 Mar 2007 11:36:18 +0000
Subject: [PATCH] append nsis menu include/lib paths in the sconscript

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4964 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/NSIS Menu/SConscript | 9 ++++++---
 SConstruct                   | 5 +----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Contrib/NSIS Menu/SConscript b/Contrib/NSIS Menu/SConscript
index 0560d24b..eda29a22 100644
--- a/Contrib/NSIS Menu/SConscript	
+++ b/Contrib/NSIS Menu/SConscript	
@@ -57,18 +57,21 @@ if os.environ.has_key('WXWIN'):
 
 	# build
 
-	BuildUtil(
+	nsis_menu = BuildUtil(
 		target,
 		files,
 		libs,
 		res = rc,
 		resources = resources,
 		flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
-		libpath = wxlib,
-		incpath = wxinc,
 		root_util = True
 	)
 
+	# set directories
+
+	nsis_menu[0].env.Append(LIBPATH = wxlib)
+	nsis_menu[0].env.Append(CPPPATH = wxinc)
+
 	# install menu files
 
 	env.DistributeMenu(html, alias='install-utils')
diff --git a/SConstruct b/SConstruct
index 4e75fb16..03c911c6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -503,15 +503,12 @@ def BuildUtil(target, source, libs, entry = None, res = None,
               resources = None, defines = None, flags = None,
               nodeflib = False, file_name = '', path='', contrib = False,
               examples = None, docs = None, cross_platform = False,
-							root_util = False, libpath = [], incpath = []):
+							root_util = False):
 	if not cross_platform:
 		env = util_env.Clone()
 	else:
 		env = cp_util_env.Clone()
 
-	env.Append(CPPPATH = incpath)
-	env.Append(LIBPATH = libpath)
-
 	AddEnvStandardFlags(env, defines, flags, entry, nodeflib)
 
 	AppendRES(env, source, res, resources)