diff mbox series

[libubootenv] Use CMAKE_INSTALL_LIBDIR instead hardcoded lib/

Message ID 20200114095709.2122-1-sbabic@denx.de
State Superseded
Headers show
Series [libubootenv] Use CMAKE_INSTALL_LIBDIR instead hardcoded lib/ | expand

Commit Message

Stefano Babic Jan. 14, 2020, 9:57 a.m. UTC 
Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 src/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad05ecc..cc3ea83 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,8 @@  SET(include_HEADERS
   libuboot.h
 )
 
+include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
+
 add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS})
 SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION})
 
@@ -19,7 +21,7 @@  add_executable(fw_setenv fw_setenv.c)
 target_link_libraries(fw_printenv ubootenv z)
 target_link_libraries(fw_setenv ubootenv z)
 
-install (TARGETS ubootenv DESTINATION lib)
+install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install (FILES libuboot.h DESTINATION include)
 install (TARGETS fw_printenv DESTINATION bin)
 install (TARGETS fw_setenv DESTINATION bin)
@@ -28,10 +30,10 @@  install (TARGETS fw_setenv DESTINATION bin)
 set(prefix      ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
 set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
-set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
+set(libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 
 configure_file(${CMAKE_SOURCE_DIR}/src/libubootenv.pc.in ${CMAKE_BINARY_DIR}/libubootenv.pc @ONLY)
 set(LIBUBOOTENV_PKG_CONFIG_FILES ${CMAKE_BINARY_DIR}/libubootenv.pc)
 message(STATUS "Generate ${LIBUBOOTENV_PKG_CONFIG_FILES}")
 # Install pkg-config files
-install(FILES ${LIBUBOOTENV_PKG_CONFIG_FILES} DESTINATION lib/pkgconfig)
+install(FILES ${LIBUBOOTENV_PKG_CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)