From d5b1bf7fbca2fd8fea5d4c365e85ae0c011aebc7 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 31 Oct 2024 18:47:33 +0200
Subject: [PATCH 9/9] meson-build_all_installers.sh: Support building from a
 separate builddir

See RM #1044

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../meson-build_all_installers.sh                | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/platforms/windows/installer_cross/meson-build_all_installers.sh b/platforms/windows/installer_cross/meson-build_all_installers.sh
index 4f5770c8c3..bf5f53db5d 100755
--- a/platforms/windows/installer_cross/meson-build_all_installers.sh
+++ b/platforms/windows/installer_cross/meson-build_all_installers.sh
@@ -29,6 +29,8 @@ fi
 DLLSPATH="$1"
 export INST_CROSS_MODE="$2"
 
+SRC_DIR="$(cd "$(dirname "$0")" || exit 1 ; pwd)"
+
 if ! test -d "${DLLSPATH}" ; then
   echo "Dllstack directory \"${DLLSPATH}\" not found!" >&2
   exit 1
@@ -51,7 +53,7 @@ then
   CROSSER_QT6=yes
 fi
 
-if ! ./meson-installer_build.sh "${DLLSPATH}" gtk3.22 ; then
+if ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" gtk3.22 ; then
   RET=1
   GTK322="Fail"
 else
@@ -60,7 +62,7 @@ fi
 
 if test "${CROSSER_GTK4}" != "yes" ; then
   GTK4="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" gtk4 ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" gtk4 ; then
   RET=1
   GTK4="Fail"
 else
@@ -69,7 +71,7 @@ fi
 
 if test "${CROSSER_GTK4}" != "yes" ; then
   GTK4x="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" gtk4x ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" gtk4x ; then
   RET=1
   GTK4x="Fail"
 else
@@ -78,7 +80,7 @@ fi
 
 if test "${CROSSER_QT6}" != "yes" ; then
   QT6="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" qt6 ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" qt6 ; then
   RET=1
   QT6="Fail"
 else
@@ -87,7 +89,7 @@ fi
 
 if test "${CROSSER_QT6}" != "yes" ; then
   QT7="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" qt6x ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" qt6x ; then
   RET=1
   QT7="Fail"
 else
@@ -97,7 +99,7 @@ fi
 # sdl2-client comes with gtk4 modpack installer
 if test "${CROSSER_GTK4}" != "yes" ; then
   SDL2="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" sdl2 ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" sdl2 ; then
   RET=1
   SDL2="Fail"
 else
@@ -106,7 +108,7 @@ fi
 
 if test "${CROSSER_QT6}" != "yes" ; then
   RULEDIT="N/A"
-elif ! ./meson-installer_build.sh "${DLLSPATH}" ruledit ; then
+elif ! "${SRC_DIR}/meson-installer_build.sh" "${DLLSPATH}" ruledit ; then
   RET=1
   RULEDIT="Fail"
 else
-- 
2.45.2