FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: make INSTALL_ROOT depend on BUILD_PREFIX as well

Browse Source 
This makes things more consistent.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-12-11 16:26:23 -05:00
parent 623eb6a16f
commit ebe317d644
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build.sh
View File

@ -174,8 +174,12 @@ if [[ ! -d "subsurface" ]] ; then
exit 1 exit 1
fi fi
mkdir -p install-root if [ -z "$BUILD_PREFIX" ] ; then
INSTALL_ROOT=$SRC/install-root INSTALL_ROOT=$SRC/install-root
else
INSTALL_ROOT="$BUILD_PREFIX"install-root
fi
mkdir -p "$INSTALL_ROOT"
export INSTALL_ROOT export INSTALL_ROOT
# make sure we find our own packages first (e.g., libgit2 only uses pkg_config to find libssh2) # make sure we find our own packages first (e.g., libgit2 only uses pkg_config to find libssh2)