commit 06d5157d69d885f3a8b17264cb01ef3e5f07e919
author Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Mon Apr 25 12:13:34 2016 -0400
committer Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Mon Apr 25 11:12:55 2016 -0500
tree 02761c98a44bd9d1cd46674b1fd0d40579e2d4ee
parent ce0ea474d5d6c52f70298253cda261c3dab2c0a7

fix x64 install dir

x64 binary weren't installed in the correct directory

*WARNING* We need to provide a new argument to makensis
so a packaging patch is necessary

Change-Id: Iee6622ec336f8533ba8b9dd6840f346c2bfe4b6f
Tuleap: #600

ring.nsi

diff --git a/ring.nsi b/ring.nsi
index 853d451..e234ab0 100644
--- a/ring.nsi
+++ b/ring.nsi
@@ -33,8 +33,6 @@
 
 RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on)
 
-InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
-
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 
@@ -53,9 +51,17 @@
 ${EndIf}
 !macroend
 
+!include x64.nsh
+
 function .onInit
         setShellVarContext all
         !insertmacro VerifyUserIsAdmin
+        StrCpy $INSTDIR "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
+        ${If} ${ARCH} == "x64"
+         ${If} ${RunningX64}
+            StrCpy $INSTDIR "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"
+         ${EndIf}
+        ${EndIf}
 functionEnd
 
 Function LaunchLink