summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-12-11 16:26:23 -0500
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-12-12 06:56:29 -0500
commitebe317d6441b9eb5359a3f9f908ece69a4e4ea7d (patch)
treedfbb5b2b9f033e08ba67cb1da7409f7a7952976d
parent623eb6a16f16943fb349642df1dec62aed9348b8 (diff)
downloadsubsurface-ebe317d6441b9eb5359a3f9f908ece69a4e4ea7d.tar.gz
build system: make INSTALL_ROOT depend on BUILD_PREFIX as well
This makes things more consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rwxr-xr-xscripts/build.sh8
1 files 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)