fix: install libraries to CMAKE_INSTALL_LIBDIR (fixes gh #240)

mhx · Oct 18, 2024 · 8e9ff27 · 8e9ff27
1 parent 2a03c10
commit 8e9ff27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh
@@ -191,7 +191,7 @@ if [[ "$BUILD_FROM_TARBALL" == "1" ]]; then
   rm -rf "$INSTALLDIR"
 
   if [[ "-$BUILD_TYPE-" == *-shared-* ]]; then
-    LDLIBPATH="$PREFIXPATH/lib"
+    LDLIBPATH="$PREFIXPATH/lib/$(gcc -print-multi-os-directory)"
     if [[ ":$LD_LIBRARY_PATH:" != *":$LDLIBPATH:"* ]]; then
       export "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}$LDLIBPATH"
     fi

diff --git a/cmake/libdwarfs.cmake b/cmake/libdwarfs.cmake
@@ -283,12 +283,12 @@ if(NOT STATIC_BUILD_DO_NOT_USE)
             ${RICEPP_OBJECT_TARGETS}
             folly_deps
     EXPORT dwarfs-targets
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
   install(
     DIRECTORY include/dwarfs
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     PATTERN include/dwarfs/internal EXCLUDE
     PATTERN include/dwarfs/tool EXCLUDE
     PATTERN include/dwarfs/*/internal EXCLUDE
@@ -297,13 +297,13 @@ if(NOT STATIC_BUILD_DO_NOT_USE)
   if(DWARFS_GIT_BUILD)
     install(
       FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/version.h
-      DESTINATION include/dwarfs
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dwarfs
     )
   endif()
 
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/config.h
-    DESTINATION include/dwarfs
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dwarfs
   )
 
   install(