From e1a5d16cecb4aeaaf047dd6b940830fc5f28dd7b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 5 Jan 2023 04:05:40 +0200 Subject: [PATCH 24/24] installer_cross: Rename meson/ as setups/ See osdn #46457 Signed-off-by: Marko Lindqvist --- 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 3 files changed, 2 insertions(+), 2 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/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,,$DLLSPATH,g" meson/cross-${SETUP}.tmpl > meson-build-${SETUP}-${GUI}/cross.txt +if ! sed "s,,$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