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

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

This fixes bug #1082.
---

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index d8b9442f..1cbd9eb1 100644
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -43,7 +43,11 @@ Name "PulseView"
 OutFile "pulseview-@PV_VERSION_STRING@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!ifdef PE64
+	InstallDir "$PROGRAMFILES64\sigrok\PulseView"
+!else
+	InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html