mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify building of Android build from one source tree

Browse source 
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 <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Jan Mulder 2016-02-02 10:17:51 +01:00 committed by Dirk Hohndel
parent 62f7a2a8f0
commit e80284fcfc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/build.sh
View file

@ -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