From 58b612c71243d0221bcc3647ad477ecbaee00cc0 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 5 Jan 2023 04:02:37 +0200
Subject: [PATCH 31/31] installer_cross: Rename meson/ as setups/

See osdn #46457

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/Makefile.am                                        | 4 ++--
 windows/installer_cross/meson-winbuild.sh                  | 4 ++--
 windows/installer_cross/{meson => setups}/cross-win32.tmpl | 0
 windows/installer_cross/{meson => setups}/cross-win64.tmpl | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename windows/installer_cross/{meson => setups}/cross-win32.tmpl (100%)
 rename windows/installer_cross/{meson => setups}/cross-win64.tmpl (100%)

diff --git a/windows/Makefile.am b/windows/Makefile.am
index 44540527ac..4c7e67df2b 100644
--- a/windows/Makefile.am
+++ b/windows/Makefile.am
@@ -54,8 +54,8 @@ dist_noinst_DATA = \
 		installer_cross/meson-build_all_installers.sh	\
 		installer_cross/meson-installer_build.sh	\
 		installer_cross/meson-winbuild.sh		\
-		installer_cross/meson/cross-win32.tmpl		\
-		installer_cross/meson/cross-win64.tmpl
+		installer_cross/setups/cross-win32.tmpl		\
+		installer_cross/setups/cross-win64.tmpl
 
 if MINGW
 nodist_noinst_DATA = 		\
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 3a998684b2..8f4c9b2138 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -66,7 +66,7 @@ fi
 
 SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//')
 
-if ! test -f "meson/cross-${SETUP}.tmpl" ; then
+if ! test -f "setups/cross-${SETUP}.tmpl" ; then
   echo "Unsupported crosser setup \"${SETUP}\"!" >&2
   exit 1
 fi
@@ -112,7 +112,7 @@ if ! mkdir -p "${BUILD_DIR}" ; then
   exit 1
 fi
 
-if ! sed "s,<PREFIX>,$DLLSPATH,g" meson/cross-${SETUP}.tmpl > meson-build-${SETUP}-${GUI}/cross.txt
+if ! sed "s,<PREFIX>,$DLLSPATH,g" setups/cross-${SETUP}.tmpl > meson-build-${SETUP}-${GUI}/cross.txt
 then
   echo "Failed to create cross-file for $SETUP build!" >&2
   exit 1
diff --git a/windows/installer_cross/meson/cross-win32.tmpl b/windows/installer_cross/setups/cross-win32.tmpl
similarity index 100%
rename from windows/installer_cross/meson/cross-win32.tmpl
rename to windows/installer_cross/setups/cross-win32.tmpl
diff --git a/windows/installer_cross/meson/cross-win64.tmpl b/windows/installer_cross/setups/cross-win64.tmpl
similarity index 100%
rename from windows/installer_cross/meson/cross-win64.tmpl
rename to windows/installer_cross/setups/cross-win64.tmpl
-- 
2.39.0