diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-04-09 15:00:52 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-04-09 15:30:48 -0700 |
| commit | 435ec2cbc2d879b1f6b0fa00394846ddfbf9c7be (patch) | |
| tree | ce1c0855428682bb9a553f5507093547d2723bff /scripts | |
| parent | 68ec73f1b06ff8a9cec9fb7def25eedf492b9610 (diff) | |
| download | subsurface-435ec2cbc2d879b1f6b0fa00394846ddfbf9c7be.tar.gz | |
build.sh: use "install-root" for our local install destination
This seems less confusing then calling it just "install".
Also adjust our cmake/Modules/Find... files accordingly.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 4675b23c2..6095202fd 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -19,7 +19,8 @@ if [[ ! -d "subsurface" ]] ; then exit 1 fi -mkdir -p install +mkdir -p install-root +INSTALL_ROOT=$SRC/install-root # build libgit2 @@ -34,7 +35,7 @@ cd libgit2 git checkout v0.22.0 mkdir -p build cd build -cmake -DCMAKE_INSTALL_PREFIX=$SRC/install -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF .. +cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF .. cmake --build . --target install cd $SRC @@ -52,7 +53,7 @@ cd libdivecomputer git checkout Subsurface-4.4 if [ ! -f configure ] ; then autoreconf --install - ./configure --prefix=$SRC/install + ./configure --prefix=$INSTALL_ROOT fi make -j4 make install @@ -73,7 +74,7 @@ git checkout Subsurface-4.4 mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ - -DCMAKE_INSTALL_PREFIX=$SRC/install \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \ -DBUILD_MARBLE_TESTS=NO \ -DWITH_DESIGNER_PLUGIN=NO \ -DBUILD_MARBLE_APPS=NO \ @@ -85,6 +86,5 @@ make install cd $SRC/subsurface mkdir -p build cd build -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$SRC/install .. +cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. make -j4 - |