From 09934b72828800ac042901a4ffd10e1df6078c57 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 2 Feb 2023 20:39:27 +0200
Subject: [PATCH 43/43] Msys2: Fix creation of the list of files to uninstall

See osdn #47285

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh  | 10 +++++++---
 windows/installer_msys2/create-freeciv-ruledit-nsi.sh | 10 +++++++---
 windows/installer_msys2/create-freeciv-sdl2-nsi.sh    | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
index 26e17f6553..8b3814d47f 100644
--- a/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-gtk-qt-nsi.sh
@@ -288,17 +288,19 @@ FunctionEnd
 
 EOF
 
-### uninstall section ###
+### Uninstall section ###
 
 cat <<EOF
-; special uninstall section.
+; Special uninstall section.
 Section "Uninstall"
 
-  ; remove files
+  ; Remove files
 EOF
 
 find $1 -type f |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
@@ -307,6 +309,8 @@ done
 
 find $1 -depth -type d |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
diff --git a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
index 1b8d398fd5..4bd73bc5aa 100644
--- a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
@@ -265,17 +265,19 @@ FunctionEnd
 
 EOF
 
-### uninstall section ###
+### Uninstall section ###
 
 cat <<EOF
-; special uninstall section.
+; Special uninstall section.
 Section "Uninstall"
 
-  ; remove files
+  ; Remove files
 EOF
 
 find $1 -type f |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
@@ -284,6 +286,8 @@ done
 
 find $1 -depth -type d |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
diff --git a/windows/installer_msys2/create-freeciv-sdl2-nsi.sh b/windows/installer_msys2/create-freeciv-sdl2-nsi.sh
index 4c7fab5b74..d9c9309a73 100644
--- a/windows/installer_msys2/create-freeciv-sdl2-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-sdl2-nsi.sh
@@ -292,17 +292,19 @@ FunctionEnd
 
 EOF
 
-### uninstall section ###
+### Uninstall section ###
 
 cat <<EOF
-; special uninstall section.
+; Special uninstall section.
 Section "Uninstall"
 
-  ; remove files
+  ; Remove files
 EOF
 
 find $1 -type f |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
@@ -311,6 +313,8 @@ done
 
 find $1 -depth -type d |
 grep -v '/$' |
+sed 's|meson/install/||' |
+sed 's|autotools/install/||' |
 sed 's|[^/]*||' |
 tr '/' '\\' | while read -r name
 do
-- 
2.39.1