mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android-build: Use subsurface source variable

Browse source 
We already have a variable pointing to the source dir for subsurface, so
use it.

This way we can build out of tree, in any directory.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2018-05-14 21:31:55 +02:00 • committed by Dirk Hohndel
parent 346bb9f31f
commit fa95a7c56a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/android/build.sh
View file

@ -368,10 +368,10 @@ fi
if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then
echo "" > libdivecomputer-${ARCH}.SHA echo "" > libdivecomputer-${ARCH}.SHA
fi fi
pushd subsurface pushd "$SUBSURFACE_SOURCE"
git submodule update --recursive git submodule update --recursive
popd popd
CURRENT_SHA=$(cd subsurface/libdivecomputer ; git describe) CURRENT_SHA=$(cd "$SUBSURFACE_SOURCE"/libdivecomputer ; git describe)
PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA) PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA)
if [[ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" || ! -e "$PKG_CONFIG_LIBDIR/libdivecomputer.pc" ]] ; then if [[ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" || ! -e "$PKG_CONFIG_LIBDIR/libdivecomputer.pc" ]] ; then
mkdir -p libdivecomputer-build-"$ARCH" mkdir -p libdivecomputer-build-"$ARCH"