From 1132e32f05bc4f57483c9a861062fba0a8b5f622 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Tue, 20 Apr 2021 12:46:34 +0200
Subject: [PATCH] nsis: Remove duplicate installation of documentation

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 qemu.nsi | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/qemu.nsi b/qemu.nsi
index 874405dbc8..b64eda36dd 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -2,7 +2,7 @@
 
 ; This NSIS script creates an installer for QEMU on Windows.
 
-; Copyright (C) 2006-2020 Stefan Weil
+; Copyright (C) 2006-2021 Stefan Weil
 ;
 ; This program is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -31,9 +31,6 @@
 !ifndef DATADIR
 !define DATADIR "${BINDIR}\share"
 !endif
-!ifndef DOCDIR
-!define DOCDIR "${DATADIR}\doc"
-!endif
 !ifndef SRCDIR
 !define SRCDIR .
 !endif
@@ -191,11 +188,11 @@ SectionEnd
 
 !ifdef CONFIG_DOCUMENTATION
 Section "$(Documentation_Section_Name)" Documentation_Section_Description
-    SetOutPath "$INSTDIR\doc"
-    File /r "${BINDIR}\doc"
+    ; SetOutPath "$INSTDIR\share\doc"
+    ; File /r "${BINDIR}\share\doc"
     SetOutPath "$INSTDIR"
     CreateDirectory "$SMPROGRAMS\${PRODUCT}"
-    CreateShortCut "$SMPROGRAMS\${PRODUCT}\$(Link_Description_User_Documentation).lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0
+    CreateShortCut "$SMPROGRAMS\${PRODUCT}\$(Link_Description_User_Documentation).lnk" "$INSTDIR\share\doc\index.html" "" "$INSTDIR\share\doc\index.html" 0
 SectionEnd
 !endif
 
@@ -236,8 +233,6 @@ Section "Uninstall" Uninstall_Section_Description
     Delete "$INSTDIR\qemu-edid.exe"
     Delete "$INSTDIR\qemu.exe"
     Delete "$INSTDIR\qemu-system-*.exe"
-    RMDir /r "$INSTDIR\doc"
-    RMDir /r "$INSTDIR\lib"
     RMDir /r "$INSTDIR\share"
     ; Remove generated files
     Delete "$INSTDIR\stderr.txt"
-- 
2.11.4.GIT