diff --git a/ci_build.sh b/ci_build.sh index d4bfdce2..7415a2f8 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -26,6 +26,6 @@ else pipx install meson export PATH=${HOME}/.local/bin:${PATH} - PREFIX=${INST} ./configure.meson build + ./configure.meson --prefix ${INST} build meson compile --verbose -C build fi diff --git a/configure.meson b/configure.meson index 5ee0f1ca..47fd81ff 100755 --- a/configure.meson +++ b/configure.meson @@ -1,27 +1,21 @@ -#!/bin/sh - -# set -xv +#!/usr/bin/env bash if [ -z "$1" ] ; then BLD="build" + BLDH="build" else - BLD="$1" - shift + BLDH=${!#} fi TOP=$(dirname "$0") -if [ -z "${PREFIX}" ] ; then - PREFIX="/usr/local" -fi - -meson setup --prefix ${PREFIX} \ +meson setup \ --native-file $TOP/fdpp/toolchain.ini \ --cross-file $TOP/fdpp/kernel/toolchain.ini \ - $BLD $TOP $* + $* $BLD $TOP [ "$?" = "0" ] || exit 1 echo echo "Done configure" -echo "Now run \"meson compile --verbose -C $BLD\" to build" -echo "After that you can do \"meson install -C $BLD\" to install" +echo "Now run \"meson compile --verbose -C $BLDH\" to build" +echo "After that you can do \"meson install -C $BLDH\" to install"