Fixed packaging for 64bit architectures

The package has a hardcoded paths to libdir in CMakeLists.txt file which works
for 32-bit architectures, but trying to build package on aarch64 makes a problem
in packaging section because %{_libdir} macros has "/usr/lib64" on 64bit
architectures.

Now CMake uses paths defined by build system: it changes nothing for 32bit
architecture but packaging won't fail for 64bit builds anymore

Change-Id: I2a0fc1da429585a7bd1c0bffb0c8b5f50eab9b8e
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 456b5b65d0495cf8d4887575bdb23f81b1226d06..e531784602ecfb95fcc74e4d3d7102e824f8e20c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ PROJECT(cryptsvc C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -114,9 +113,9 @@ SET(PC_LDFLAGS " -l${PROJECT_NAME} ")
 SET(PC_REQUIRED ${pc_requires})
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(TARGETS ${LIBTZ_SO} DESTINATION lib)
+INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${LIBTZ_SO} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${INCLUDEDIR})
 
 ADD_DEFINITIONS(-D_bool_cryptsvc)

diff --git a/cryptsvc.pc.in b/cryptsvc.pc.in
index 2cd5754216cd45fd0725fd3f99361d77a9b57477..be4fe2fe61c876250b2ac80f18eb30c6b53f9456 100644 (file)
--- a/cryptsvc.pc.in
+++ b/cryptsvc.pc.in
@@ -1,8 +1,8 @@
 # Package Information for pkg-config
 
 prefix=@PREFIX@
-libdir=@PREFIX@/lib
-includedir=@PREFIX@/include
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
 
 Name: @PC_NAME@
 Description: @DESCRIPTION@