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

See osdn #46103

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

diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson
index c71116416e..354281c688 100644
--- a/doc/INSTALL.meson
+++ b/doc/INSTALL.meson
@@ -34,7 +34,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.
@@ -56,7 +56,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 7774b7d833..ddce57ffe8 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -42,7 +42,13 @@ fi
 
 mkdir build
 cd build
-meson .. -Dprefix=${HOME}/freeciv/meson -Ddebug=true -Dack_experimental=true -Dclients='gtk3.22','qt','sdl2','gtk4' -Dfcmp='gtk3','qt','cli','gtk4' -Dqtver=qt5
+meson setup .. \
+      -Dprefix=${HOME}/freeciv/meson \
+      -Ddebug=true \
+      -Dack_experimental=true \
+      -Dclients='gtk3.22','qt','sdl2','gtk4' \
+      -Dfcmp='gtk3','qt','cli','gtk4' \
+      -Dqtver=qt5
 ninja
 ninja install
 ;;
@@ -91,7 +97,7 @@ export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"
 
 mkdir build
 cd build
-meson .. \
+meson setup .. \
   -Dack_experimental=true \
   -Ddebug=true \
   -Druledit=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" \
-- 
2.35.1