From 2cf9ecc10e2cc24f70798e4d13cd2bea6fbd3c59 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 16 Sep 2012 14:45:43 +0000
Subject: [PATCH] Must extract nsisconf.nsh to $InstDir

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6263 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/makensis.nsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 4c7e6b76..c49e6948 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -114,6 +114,11 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   SetOutPath $INSTDIR
   RMDir /r $SMPROGRAMS\NSIS
 
+  IfFileExists $INSTDIR\nsisconf.nsi "" +2
+  Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
+  SetOverwrite off
+  File ..\nsisconf.nsh
+
   SetOverwrite on
   File ..\makensis.exe
   File ..\makensisw.exe
@@ -121,6 +126,7 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   File ..\NSIS.chm
   File ..\NSIS.exe
   File /nonfatal ..\NSIS.exe.manifest
+
   SetOutPath $INSTDIR\Bin
   File ..\Bin\makensis.exe
 !ifdef USE_NEW_ZLIB
@@ -129,12 +135,6 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   File ..\Bin\zlib1.dll
 !endif
 
-  IfFileExists $INSTDIR\nsisconf.nsi "" +2
-  Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
-  SetOverwrite off
-  File ..\nsisconf.nsh
-  SetOverwrite on
-
   SetOutPath $INSTDIR\Stubs
   File ..\Stubs\bzip2
   File ..\Stubs\bzip2_solid