From 138f0255f85f26fcfd2a414e2a34a987c695a141 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 5 Nov 2017 07:05:08 -0800 Subject: [PATCH] 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 --- scripts/build.sh | 6 ++---- 1 file 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