Commit 06d5157d authored by Edric Milaret's avatar Edric Milaret

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
parent ce0ea474
......@@ -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 @@ ${If} $0 != "admin" ;Require admin rights on NT4+
${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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment