diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2016-02-02 10:17:51 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-02 09:28:47 -0800 |
| commit | e80284fcfc002a8132ca3a6b6ac5b1d685377d52 (patch) | |
| tree | dc34117d4ad94d783066ac4468e286e8ba6fbdc1 /scripts | |
| parent | 62f7a2a8f0c922b42715320dfca2e68068030be6 (diff) | |
| download | subsurface-e80284fcfc002a8132ca3a6b6ac5b1d685377d52.tar.gz | |
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 <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 10 |
1 files changed, 7 insertions, 3 deletions
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 |