Merge pull request #439 from algo99/master

* Fix local installation paths on Linux, see issue #393
Murmele · Feb 17, 2023 · 359d28f · 359d28f
2 parents a4f4434 + 3dbaedd
commit 359d28f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/dep/git/CMakeLists.txt b/dep/git/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT USE_SYSTEM_GIT)
     if(NOT APPLE)
       install(
         TARGETS ${TARGET}
-        DESTINATION .
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT ${GITTYUP_NAME})
     endif()
   endmacro()

diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt
@@ -100,7 +100,7 @@ elseif(NOT USE_SYSTEM_QT)
 
       install(
         FILES ${QT_LIBRARY}
-        DESTINATION .
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
         PERMISSIONS
           OWNER_READ
           OWNER_WRITE
@@ -131,7 +131,7 @@ if(UNIX AND NOT APPLE)
 
   install(
     FILES "${LIB_PATH}/${LIB_NAME}${LIB_EXT}"
-    DESTINATION .
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PERMISSIONS
       OWNER_READ
       OWNER_WRITE
@@ -166,7 +166,7 @@ if(NOT APPLE)
 
       install(
         FILES ${SSL_LIB}
-        DESTINATION .
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
         PERMISSIONS
           OWNER_READ
           OWNER_WRITE

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -162,7 +162,7 @@ else()
   # Install application.
   install(
     TARGETS gittyup
-    DESTINATION .
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT ${GITTYUP_NAME})
 endif()
 

diff --git a/src/index/CMakeLists.txt b/src/index/CMakeLists.txt
@@ -44,7 +44,7 @@ else()
   else()
     install(
       TARGETS indexer
-      DESTINATION .
+      DESTINATION ${CMAKE_INSTALL_BINDIR}
       COMPONENT ${GITTYUP_NAME})
   endif()
 endif()
diff --git a/src/update/CMakeLists.txt b/src/update/CMakeLists.txt
@@ -41,7 +41,7 @@ elseif(UNIX)
   else()
     install(
       TARGETS relauncher
-      DESTINATION .
+      DESTINATION ${CMAKE_INSTALL_BINDIR}
       COMPONENT ${GITTYUP_NAME})
   endif()
 endif()