1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
Description: Use ${CMAKE_INSTALL_LIBDIR} from GNUInstallDirs instead of lib.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/8
Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/711bfd8f4004f7446e271cb341666fb56bb35597
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -689,7 +689,7 @@ endif(BUILD_WITH_PYTHON)
########## INSTALL ##########
INSTALL(TARGETS ${JIPLIB_LIB_NAME}
LIBRARY
- DESTINATION lib
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT libraries
PUBLIC_HEADER
DESTINATION include/${JIPLIB_LIB_NAME}
@@ -697,7 +697,7 @@ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jiplib.pc
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
INSTALL(CODE
"execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --root ${CMAKE_CURRENT_SOURCE_DIR}/debian/tmp --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
--- a/cmake.pc.in
+++ b/cmake.pc.in
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
includedir=@CMAKE_INSTALL_PREFIX@/include
Name: jiplib
|