/soc/2013/ankitkv/gobjectification: 3955e53cbdb0: Merged default...

[Ankit Vani]

Changeset: 3955e53cbdb0e29cf25d9ff93b9bb28e84b2a098
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-11-28 13:49 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3955e53cbdb0

Description:

Merged default branch

diffstat:

 pidgin/win32/prepare-workspace.sh |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (24 lines):

diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -4,12 +4,19 @@
 #
 # Written by Tomek Wasilczyk <tomkiewicz at 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