From a37014d6e711e73eee86233b5b78f7460d4edd8e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 13 Feb 2023 00:32:10 +0200
Subject: [PATCH 28/28] installer_cross: Rename meson-install/ as
 meson/install/

See osdn #47344

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/meson-installer_build.sh | 2 +-
 windows/installer_cross/meson-winbuild.sh        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh
index ad2718e209..729330bbe0 100755
--- a/windows/installer_cross/meson-installer_build.sh
+++ b/windows/installer_cross/meson-installer_build.sh
@@ -171,7 +171,7 @@ if test "$INST_CROSS_MODE" != "release" ; then
   fi
 fi
 
-INSTDIR="meson-install/freeciv-${VERREV}-${SETUP}-${GUI}"
+INSTDIR="meson/install/freeciv-${VERREV}-${SETUP}-${GUI}"
 
 if ! mv $INSTDIR/bin/* $INSTDIR/ ||
    ! mv $INSTDIR/share/freeciv $INSTDIR/data ||
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 42050acd6f..8c637f7011 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -119,7 +119,7 @@ then
 fi
 
 PACKAGENAME="freeciv-${VERREV}-${SETUP}-${GUI}"
-MESON_INSTALL_DIR="$(pwd)/meson-install/${PACKAGENAME}"
+MESON_INSTALL_DIR="$(pwd)/meson/install/${PACKAGENAME}"
 
 if ! rm -Rf "${MESON_INSTALL_DIR}" ; then
   echo "Failed to clear out old install directory!" >&2
@@ -189,9 +189,9 @@ if ! mkdir -p meson/Output ; then
   exit 1
 fi
 
-( cd meson-install
+( cd meson/install
 
-  if ! 7z a -r ../meson/Output/${PACKAGENAME}.7z ${PACKAGENAME}
+  if ! 7z a -r ../Output/${PACKAGENAME}.7z ${PACKAGENAME}
   then
     echo "7z failed" >&2
     exit 1
-- 
2.39.1