From bd19177d8bdc2e1a51a214466c1ab330c46c0304 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 1 Apr 2023 19:38:38 +0300
Subject: [PATCH 32/32] installer_cross meson: Move build directories under
 meson/

See osdn #47739

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

diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh
index 729330bbe0..b895c45beb 100755
--- a/windows/installer_cross/meson-installer_build.sh
+++ b/windows/installer_cross/meson-installer_build.sh
@@ -160,7 +160,7 @@ SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//'
 
 VERREV="$(../../fc_version)"
 
-if ! ( cd "meson-build-${SETUP}-${GUI}" && ninja langstat_core.txt ) ; then
+if ! ( cd "meson/build/${SETUP}-${GUI}" && ninja langstat_core.txt ) ; then
   echo "langstat_core.txt creation failed!" >&2
   exit 1
 fi
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 84fc581811..7e45b3a72d 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -43,7 +43,9 @@ if ! test -f "$DLLSPATH/crosser.txt" ; then
   exit 1
 fi
 
-VERREV="$(../../fc_version)"
+SRC_ROOT="$(cd ../.. || exit 1 ; pwd)"
+
+VERREV="$(${SRC_ROOT}/fc_version)"
 if test "$INST_CROSS_MODE" != "release" ; then
   if test -d ../../.git || test -f ../../.git ; then
     VERREV="$VERREV-$(cd ../.. && git rev-parse --short HEAD)"
@@ -100,7 +102,7 @@ if test "$CLIENT" = "" ; then
   CLIENT="$GUI"
 fi
 
-BUILD_DIR="meson-build-${SETUP}-${GUI}"
+BUILD_DIR="meson/build/${SETUP}-${GUI}"
 
 if ! rm -Rf "${BUILD_DIR}" ; then
   echo "Failed to clear out old build directory!" >&2
@@ -112,7 +114,8 @@ if ! mkdir -p "${BUILD_DIR}" ; then
   exit 1
 fi
 
-if ! sed "s,<PREFIX>,$DLLSPATH,g" setups/cross-${SETUP}.tmpl > meson-build-${SETUP}-${GUI}/cross.txt
+if ! sed "s,<PREFIX>,$DLLSPATH,g" setups/cross-${SETUP}.tmpl \
+     > "${BUILD_DIR}/cross.txt"
 then
   echo "Failed to create cross-file for $SETUP build!" >&2
   exit 1
@@ -149,7 +152,7 @@ if ! meson setup \
      -Druledit="$RULEDIT" \
      $QTPARAMS \
      $EXTRA_CONFIG \
-     ../../.. ; then
+     "${SRC_ROOT}" ; then
   echo "Meson run failed!" >&2
   exit 1
 fi
-- 
2.39.2