nsis: Fix the "working dir" path for PulseView.

[pulseview.git] / contrib / pulseview_cross.nsi

diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi
index 09d9643377e6c1c707971bb84cc8c304d129c060..7e9dd923c5d1f5ed1383bce086abb3075999b22d 100644 (file)
--- a/contrib/pulseview_cross.nsi
+++ b/contrib/pulseview_cross.nsi
@@ -137,6 +137,10 @@ Section "PulseView (required)" Section1
        # libusb0.dll (needed for libusb-0.1).
        File "${CROSS}/libusb0.dll"
 
+       # Zadig (used for installing libusb-win32 and WinUSB drivers).
+       File "${CROSS}/zadig.exe"
+       File "${CROSS}/zadig_xp.exe"
+
        # Install the file(s) specified below into the specified directory.
        SetOutPath "$INSTDIR\decoders"
 
@@ -157,6 +161,7 @@ Section "PulseView (required)" Section1
        CreateDirectory "$SMPROGRAMS\sigrok\PulseView"
 
        # Create a shortcut for the PulseView application.
+       SetOutPath "$INSTDIR"
        CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk" \
                "$INSTDIR\pulseview.exe" "" "$INSTDIR\pulseview.exe" \
                0 SW_SHOWNORMAL \
@@ -221,6 +226,8 @@ Section "Uninstall"
        Delete "$INSTDIR\COPYING"
        Delete "$INSTDIR\pulseview.exe"
        Delete "$INSTDIR\libusb0.dll"
+       Delete "$INSTDIR\zadig.exe"
+       Delete "$INSTDIR\zadig_xp.exe"
 
        # Delete all decoders and everything else in decoders/.
        # There could be *.pyc files or __pycache__ subdirs and so on.