From: xorloser <redacted>
Date: Thu, 10 Sep 2020 05:36:40 +0000 (+1000)
Subject: nsis: Fix for installing 64bit Windows programs into 'Program Files'
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a23df119fc43c72eacf1dbd68d6fc0b205cee60b;p=sigrok-cli.git

nsis: Fix for installing 64bit Windows programs into 'Program Files'

This fixes bug #1082.
---

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index c28668a..6f60540 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -40,7 +40,11 @@ Name "@PACKAGE_NAME@"
 OutFile "@PACKAGE_NAME@-@SC_PACKAGE_VERSION@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\@PACKAGE_NAME@"
+!ifdef PE64
+	InstallDir "$PROGRAMFILES64\sigrok\@PACKAGE_NAME@"
+!else
+	InstallDir "$PROGRAMFILES\sigrok\@PACKAGE_NAME@"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html