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>

4 files changed, 12 insertions, 12 deletions

diff --git a/cmake/Modules/FindLIBGIT2.cmake b/cmake/Modules/FindLIBGIT2.cmake
index b352665bb..6e1193f50 100644
--- a/cmake/Modules/FindLIBGIT2.cmake
+++ b/cmake/Modules/FindLIBGIT2.cmake
@@ -16,7 +16,7 @@ ENDIF ()
 FIND_PATH( LIBGIT2_INCLUDE_DIR
 NAMES git2.h
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include
     /usr/local/include
     /usr/include
@@ -27,7 +27,7 @@ NAMES
     libgit2.a
     git2
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
     ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build
     /usr/local/include
     /usr/include
diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake
index d470cccdb..1ab0fc5dc 100644
--- a/cmake/Modules/FindLibdivecomputer.cmake
+++ b/cmake/Modules/FindLibdivecomputer.cmake
@@ -16,7 +16,7 @@ ENDIF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
 FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR
 NAMES libdivecomputer/hw.h
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/
     /usr/local/include
     /usr/include
@@ -27,7 +27,7 @@ NAMES
     libdivecomputer.a
     divecomputer
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
     ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/
     /usr/local/include
     /usr/include
diff --git a/cmake/Modules/FindMarble.cmake b/cmake/Modules/FindMarble.cmake
index 4e167a6a2..b50aeca24 100644
--- a/cmake/Modules/FindMarble.cmake
+++ b/cmake/Modules/FindMarble.cmake
@@ -16,7 +16,7 @@ ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
 FIND_PATH( MARBLE_INCLUDE_DIR
 NAMES marble/MarbleModel.h
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib
     ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib
     /usr/local/include
@@ -28,7 +28,7 @@ NAMES
     ssrfmarblewidget
     marblewidget
 HINTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../install/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
     ${CMAKE_CURRENT_SOURCE_DIR}/../marble
     ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source
     /usr/local/include
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
-