Commit 5294de36 authored by Shih-Yuan Lee (FourDollars)'s avatar Shih-Yuan Lee (FourDollars)

Merge remote-tracking branch 'origin/fix-multiarch' into debian

parents 9e4349f1 0f729922
......@@ -4,7 +4,4 @@ usr/lib/*/libsysstat-qt5.so
usr/lib/*/pkgconfig/sysstat-qt5.pc
usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake
usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake
usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake
usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-none.cmake
usr/share/cmake/sysstat-qt5/sysstat_use.cmake
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
project(libsysstat)
# Set default installation paths
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries")
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
set(INCLUDE_INSTALL_DIR include CACHE PATH "Installation path for includes")
set(MAJOR_VERSION 0)
--- a/cmake/create_pkgconfig_file.cmake
+++ b/cmake/create_pkgconfig_file.cmake
@@ -28,7 +28,7 @@
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
install(FILES ${_pkgfname} DESTINATION libdata/pkgconfig)
else()
- install(FILES ${_pkgfname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ install(FILES ${_pkgfname} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
endif()
endmacro()
fix-multiarch.patch
......@@ -7,6 +7,11 @@
dh ${@} --buildsystem cmake --parallel
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_install:
dh_install --list-missing --fail-missing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment