From aaef4e35eb83bc239353036e7bbcb888c655227e Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 24 Feb 2006 19:19:49 +0000
Subject: [PATCH] fixed bug #1434215 - #define local leaks into path settings

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4539 212acab6-be3b-0410-9dea-997c60f758d6
---
 SConstruct          | 9 +++++----
 Source/build.cpp    | 2 +-
 Source/makenssi.cpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index bc1a5ab2..8471ca3d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -142,6 +142,11 @@ Help(opts.GenerateHelpText(defenv))
 # build configuration
 SConscript('SCons/config.py')
 
+# add prefixes defines
+if defenv['PLATFORM'] != 'win32':
+	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_CONF', '"%s"' % defenv['PREFIX_CONF'])])
+	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', '"%s"' % defenv['PREFIX_DATA'])])
+
 # write configuration into sconf.h
 f = open(File('#Source/exehead/sconf.h').abspath, 'w')
 for i in defenv['NSIS_CPPDEFINES']:
@@ -172,10 +177,6 @@ defenv.Execute(Delete('$ZIPDISTDIR'))
 defenv.Execute(Delete('$INSTDISTDIR'))
 defenv.Execute(Delete('$TESTDISTDIR'))
 
-if defenv['PLATFORM'] != 'win32':
-	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_CONF', defenv['PREFIX_CONF'])])
-	defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', defenv['PREFIX_DATA'])])
-
 def Distribute(files, names, component, path, subpath, alias, install_alias=None):
 	if isinstance(files, (str, type(File('SConstruct')))):
 		files = [files]
diff --git a/Source/build.cpp b/Source/build.cpp
index 1ae615a4..f01fc0c7 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -482,7 +482,7 @@ void CEXEBuild::initialize(const char *makensis_path)
 #ifndef NSIS_CONFIG_CONST_DATA_PATH
     nsis_dir = get_executable_dir(makensis_path);
 #else
-    nsis_dir = CONST_STR(PREFIX_DATA);
+    nsis_dir = PREFIX_DATA;
 #endif
   }
   definedlist.add("NSISDIR", nsis_dir.c_str());
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index 7ca8d5d6..1550362f 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -398,7 +398,7 @@ int main(int argc, char **argv)
 #ifndef NSIS_CONFIG_CONST_DATA_PATH
           main_conf = get_executable_dir(argv[0]);
 #else
-          main_conf = CONST_STR(PREFIX_CONF);
+          main_conf = PREFIX_CONF;
 #endif
         else main_conf = env_var;
         main_conf += PLATFORM_PATH_SEPARATOR_STR;