From bed46e0e753716d2077b6315624cc95b21ce80f4 Mon Sep 17 00:00:00 2001
From: Andrew Bird <ajb@spheresystems.co.uk>
Date: Fri, 8 Dec 2023 11:30:49 +0000
Subject: [PATCH] CI: Don't cd into build directory

---
 ci_build.sh     |  8 ++++----
 configure.meson | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ci_build.sh b/ci_build.sh
index c38fdea9..9c1b7509 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -26,8 +26,8 @@ else
   pipx install meson
   export PATH=${HOME}/.local/bin:${PATH}
 
-  mkdir build
-  cd build || (echo "Could not switch into build dir" && exit 1)
-  PREFIX=${INST} ../configure.meson
-  meson compile --verbose
+  mkdir build || (echo "Could not create build dir" && exit 1)
+
+  PREFIX=${INST} ./configure.meson
+  meson compile --verbose -C build
 fi
diff --git a/configure.meson b/configure.meson
index ccb6230a..64b91514 100755
--- a/configure.meson
+++ b/configure.meson
@@ -1,12 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # set -xv
 
-if [ -f meson.build ]; then
+if [ ! -d build ] ; then
     echo -e "Create a build dir first:"
     echo -e "\tmkdir build"
-    echo -e "\tcd build"
-    echo -e "\t../$(basename $0)"
+    echo -e "\t./$(basename $0)"
     echo "Bye!"
     exit 0
 fi
@@ -21,10 +20,10 @@ meson setup --prefix ${PREFIX} \
   --native-file $TOP/fdpp/toolchain.ini \
   --cross-file $TOP/fdpp/toolchain.ini \
   --cross-file $TOP/fdpp/kernel/toolchain.ini \
-  --native-file $TOP/fdpp/kernel/toolchain.ini . $TOP
+  --native-file $TOP/fdpp/kernel/toolchain.ini build $TOP
 [ "$?" = "0" ] || exit 1
 
 echo
 echo "Done configure"
-echo "Now run \"meson compile --verbose\" to build"
-echo "After that you can do \"sudo meson install\" to install"
+echo "Now run \"meson compile --verbose -C build\" to build"
+echo "After that you can do \"sudo meson install -C build\" to install"