Fix build for x64 arch: Remove harcoded path

Change-Id: I4310f1914a9adfbf42b10fd4b59715e87c858007
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@eurogiciel.fr>

diff --git a/bt-api/CMakeLists.txt b/bt-api/CMakeLists.txt
index 44c34b0..c8ef1a4 100644 (file)
--- a/bt-api/CMakeLists.txt
+++ b/bt-api/CMakeLists.txt
@@ -79,8 +79,8 @@ SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(bluetooth-api ${packages_LDFLAGS})
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-api.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS bluetooth-api DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS bluetooth-api DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/${hfile} DESTINATION include/bt-service)

diff --git a/bt-api/bluetooth-api.pc.in b/bt-api/bluetooth-api.pc.in
index c7210a4..e577fa3 100644 (file)
--- a/bt-api/bluetooth-api.pc.in
+++ b/bt-api/bluetooth-api.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: bluetooth-api

diff --git a/bt-api/bt-service-api.pc.in b/bt-api/bt-service-api.pc.in
index d0d81d4..0012031 100644 (file)
--- a/bt-api/bt-service-api.pc.in
+++ b/bt-api/bt-service-api.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: bt-service