From 9c5ac135902d1fc55507cd89dd2cafd38dfad795 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 27 Nov 2022 13:27:06 +0200
Subject: [PATCH 30/30] Meson: Use explicit 'setup' subcommand

See osdn #46103

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

diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson
index 4b41baa38b..3b30a5d76b 100644
--- a/doc/INSTALL.meson
+++ b/doc/INSTALL.meson
@@ -33,7 +33,7 @@ source directory as parameter. You can also give configure options in this
 phase.
 
 > mkdir build ; cd build
-> meson ../freeciv-3.1.0
+> meson setup ../freeciv-3.1.0
 
 You need to configure the build directory just once. As source files get
 updated, you can just execute incremental builds in the build directory.
@@ -55,7 +55,7 @@ Configure options are given as '-D<option>=<value>'.
 For example to set freeciv installation prefix as
 '/home/cazfi/freeciv-install':
 
-> meson ../src -Dprefix=/home/cazfi/freeciv-install
+> meson setup ../src -Dprefix=/home/cazfi/freeciv-install
 
 You can give configure options when you first set up the build directory
 (like in example above), or you can change configure options for the
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 44b3170284..e67bd448ad 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -44,7 +44,7 @@ fi
 
 mkdir build
 cd build
-meson .. \
+meson setup .. \
   -Dprefix=${HOME}/freeciv/meson \
   -Ddebug=true \
   -Dclients='gtk3.22','qt','sdl2','gtk4','stub' \
@@ -98,7 +98,7 @@ export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"
 
 mkdir build
 cd build
-meson .. \
+meson setup .. \
   -Ddebug=true \
   -Druledit=true \
   -Dsyslua=true \
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 5ff1b1adb5..d1db8aa41c 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -130,7 +130,7 @@ export PKG_CONFIG_PATH=${DLLSPATH}/lib/pkgconfig
 
 export PATH="$DLLSPATH/linux/libexec:$PATH"
 
-if ! meson \
+if ! meson setup \
      --cross-file=cross.txt \
      -Dprefix="$MESON_INSTALL_DIR" \
      -Dclients="$CLIENT" -Dfcmp="$FCMP" \
diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson
index ade928bf4f..44b56e8210 100644
--- a/windows/installer_msys2/Makefile.meson
+++ b/windows/installer_msys2/Makefile.meson
@@ -98,7 +98,7 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI)
 install-freeciv-common: clean-install-common
 	# create build directory
 	mkdir -p meson-build-$(WINARCH)-$(GUI)
-	cd meson-build-$(WINARCH)-$(GUI); meson ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' $(EXTRA_CONFIG)
+	cd meson-build-$(WINARCH)-$(GUI); meson setup ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' $(EXTRA_CONFIG)
 	cd meson-build-$(WINARCH)-$(GUI); ninja
 	cd meson-build-$(WINARCH)-$(GUI); ninja install
 	cd meson-build-$(WINARCH)-$(GUI); ninja langstat_core.txt
-- 
2.35.1