diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-05 07:05:08 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-05 13:15:53 -0800 |
| commit | 138f0255f85f26fcfd2a414e2a34a987c695a141 (patch) | |
| tree | ae633848b92f94fa957cee12da1d29a07358bfe1 /scripts | |
| parent | 76286c4ece36baff3aaabb8a4e1252997d8ad7c4 (diff) | |
| download | subsurface-138f0255f85f26fcfd2a414e2a34a987c695a141.tar.gz | |
build.sh: always install Subsurface
We had not done this on Linux as it was just as easy to run from the build
environment, but we need to install in order to be able to create an AppImage
on Travis.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 4861ad318..b5704af8a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -475,6 +475,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do -DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \ -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \ -DBTSUPPORT=${BTSUPPORT} \ + -DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT} \ $PRINTING $EXTRA_OPTS if [ $PLATFORM = Darwin ] ; then @@ -483,8 +484,5 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do fi LIBRARY_PATH=$INSTALL_ROOT/lib make -j4 - - if [ $PLATFORM = Darwin ] ; then - LIBRARY_PATH=$INSTALL_ROOT/lib make install - fi + LIBRARY_PATH=$INSTALL_ROOT/lib make install done |