Merge pull request #249 from TheBlueMatt/nsisfix

Update NSIS Installer file to support the new directory structure.

1 files changed, 8 insertions, 8 deletions

diff --git a/share/setup.nsi b/share/setup.nsi
index b17e553372..4239f53207 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -9,7 +9,7 @@ RequestExecutionLevel highest
 !define URL http://www.bitcoin.org/

 

 # MUI Symbol Definitions

-!define MUI_ICON "src\rc\bitcoin.ico"

+!define MUI_ICON "../share/pixmaps/bitcoin.ico"

 !define MUI_FINISHPAGE_NOAUTOCLOSE

 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM

 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}

@@ -59,16 +59,16 @@ ShowUninstDetails show
 Section -Main SEC0000

     SetOutPath $INSTDIR

     SetOverwrite on

-    File bitcoin.exe

-    File libeay32.dll

-    File license.txt

-    File readme.txt

+    File ../src/bitcoin.exe

+    File ../../openssl-1.0.0d/libeay32.dll

+    File /oname=license.txt ../COPYING

+    File /oname=readme.txt ../doc/README_windows.txt

     SetOutPath $INSTDIR\daemon

-    File /r daemon\*.*

+    File ../src/bitcoind.exe

     SetOutPath $INSTDIR\locale

-    File /r locale\*.*

+    File /r ../locale/*.*

     SetOutPath $INSTDIR\src

-    File /r src\*.*

+    File /r /x *.exe /x *.o ../src\*.*

     SetOutPath $INSTDIR

     WriteRegStr HKCU "${REGKEY}\Components" Main 1

 SectionEnd