diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-02 18:35:40 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-02 18:35:40 -0700 |
| commit | 73f2cc631caed1bc6d29d538027ec286ded07b49 (patch) | |
| tree | 5bcaa087aa0cfd71887af2013a8d9306bcaa103a | |
| parent | 0fea81ccdf657b12f15392c894350d7f0eba82da (diff) | |
| download | subsurface-73f2cc631caed1bc6d29d538027ec286ded07b49.tar.gz | |
Build script: small updates around installation on Linux
Don't install by default (and don't configure Subsurface to install into
install-root).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | scripts/build.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index d72e213bf..8167a0aee 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -200,7 +200,7 @@ fi cd $SRC/subsurface mkdir -p build cd build -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. \ +cmake -DCMAKE_BUILD_TYPE=Debug .. \ -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include \ -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$INSTALL_ROOT/include \ @@ -215,4 +215,7 @@ if [ $PLATFORM = Darwin ] ; then fi LIBRARY_PATH=$INSTALL_ROOT/lib make -j4 -LIBRARY_PATH=$INSTALL_ROOT/lib make install + +if [ $PLATFORM = Darwin ] ; then + LIBRARY_PATH=$INSTALL_ROOT/lib make install +fi |