]> sigrok.org Git - pulseview.git/commitdiff
nsis: Fix for installing 64bit Windows programs into 'Program Files'
authorxorloser <redacted>
Thu, 10 Sep 2020 05:31:52 +0000 (15:31 +1000)
committerUwe Hermann <redacted>
Mon, 26 Oct 2020 21:56:50 +0000 (22:56 +0100)
This fixes bug #1082.

contrib/pulseview_cross.nsi.in

index d8b9442fe020d038ed95df6b649236a588d9515f..1cbd9eb1630741384d80756ab3fe0f51a8b8f9c6 100644 (file)
@@ -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