From d6209244f86c67bb6ccd02fdbf2878546dfcb621 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 5 Sep 2021 08:17:53 +0300 Subject: [PATCH 19/19] Msys2: Fix 'make clean' to remove Qt installer See osdn #42789 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 56240a4fea..339fcf29e0 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -557,7 +557,7 @@ clean-install-ruledit-qt6: ./cleanup_checkout.sh ../.. clean-installer-common: - rm -f Output/Freeciv-*-$(GUI)-setup.exe + rm -f Output/Freeciv-*-$(CLIENT)-setup.exe rm -f Freeciv-*-$(GUI).nsi clean-installer-ruledit-qt5: @@ -569,8 +569,8 @@ clean-installer-ruledit-qt6: rm -f Freeciv-*-ruledit-qt6.nsi clean: - make GUI=gtk3.22 clean-build-common clean-install-common clean-installer-common - make GUI=sdl2 clean-build-common clean-install-common clean-installer-common - make GUI=qt5 clean-build-common clean-install-common clean-installer-common + make GUI=gtk3.22 CLIENT=gtk3.22 clean-build-common clean-install-common clean-installer-common + make GUI=sdl2 CLIENT=sdl2 clean-build-common clean-install-common clean-installer-common + make GUI=qt5 CLIENT=qt clean-build-common clean-install-common clean-installer-common make clean-build-ruledit-qt5 clean-install-ruledit-qt5 clean-installer-ruledit-qt5 make clean-build-ruledit-qt6 clean-install-ruledit-qt6 clean-installer-ruledit-qt6 -- 2.33.0