From e80284fcfc002a8132ca3a6b6ac5b1d685377d52 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Tue, 2 Feb 2016 10:17:51 +0100 Subject: Simplify building of Android build from one source tree Currently, when running the packaging/android/build.sh from a source tree that has been used for desktop builds, libdivecomputer wants a make distclean. This is inconvinient, and is caused by building libdivecomputer in source. Now, configure and build libdivecomputer in a new subdirectory, allowing to run the android build script from the same source tree as the desktop (both desktop and mobile) builds. Signed-off-by: Jan Mulder Signed-off-by: Dirk Hohndel --- scripts/build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'scripts/build.sh') diff --git a/scripts/build.sh b/scripts/build.sh index b313cec77..79264b0e4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -109,10 +109,14 @@ if ! git checkout Subsurface-branch ; then echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up" exit 1 fi -if [ ! -f configure ] ; then - autoreconf --install + +mkdir -p build +cd build + +if [ ! -f ../configure ] ; then + autoreconf --install .. fi -./configure --prefix=$INSTALL_ROOT +../configure --prefix=$INSTALL_ROOT make -j4 make install -- cgit v1.2.3-70-g09d2