From ebe317d6441b9eb5359a3f9f908ece69a4e4ea7d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 11 Dec 2019 16:26:23 -0500 Subject: build system: make INSTALL_ROOT depend on BUILD_PREFIX as well This makes things more consistent. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 9ff64bb41..572c62b4a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -174,8 +174,12 @@ if [[ ! -d "subsurface" ]] ; then exit 1 fi -mkdir -p install-root -INSTALL_ROOT=$SRC/install-root +if [ -z "$BUILD_PREFIX" ] ; then + INSTALL_ROOT=$SRC/install-root +else + INSTALL_ROOT="$BUILD_PREFIX"install-root +fi +mkdir -p "$INSTALL_ROOT" export INSTALL_ROOT # make sure we find our own packages first (e.g., libgit2 only uses pkg_config to find libssh2) -- cgit v1.2.3-70-g09d2