Windows: fix prepare script for win64. A patch provided by TLemur. Fixes #15819

Mon, 25 Nov 2013 16:51:46 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Mon, 25 Nov 2013 16:51:46 +0100
changeset 34523
1d3a0e42cb09
parent 34521
90aea2dd2e4e
child 35087
3955e53cbdb0
child 35092
b1fe9d846643

Windows: fix prepare script for win64. A patch provided by TLemur. Fixes #15819

pidgin/win32/prepare-workspace.sh file | annotate | diff | comparison | revisions
--- a/pidgin/win32/prepare-workspace.sh	Sat Nov 23 12:52:19 2013 -0500
+++ b/pidgin/win32/prepare-workspace.sh	Mon Nov 25 16:51:46 2013 +0100
@@ -4,12 +4,19 @@
 #
 # Written by Tomek Wasilczyk <tomkiewicz@cpw.pidgin.im>, licensed under GNU GPL
 
+PLATFORM=`uname -m`
+
 # configuration
 
 BONJOUR_GUID_PACKED="5CA28B3B1DEA7654999C464610C010EB 2EA34582882FE334694F0BCD7D8DE336"
 ACTIVEPERL_GUID_PACKED="BC98F31FB8440B94CB3674649419766C 547A2C684F806164DB756F228DAB5840 5E7EC16051106BB43818746C209BC8D7"
 PERL_DIR_FALLBACK="/cygdrive/c/Perl/bin"
-NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@"
+if [ "$PLATFORM" == "x86_64" ]; then
+       NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/NSIS/@"
+else
+       NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@"
+fi
+
 
 DEBUG_SKIP_DOWNLOADING=0
 DEBUG_SKIP_INSTALL=0

mercurial