aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch
blob: b44ad1c49c408a48a077becaa0d0bd85c1086fc2 (plain)
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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001
From: Clement Dransart <clement.dransart@awtce.be>
Date: Fri, 17 Jun 2016 10:40:36 +0200
Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib

Signed-off-by: Clement Dransart <clement.dransart@awtce.be>
---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b977b76..d5fbc4a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER})
 GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER})
 
 if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
-	set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command")
+	set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command")
 endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR)
 if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
-	set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing")
+	set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing")
 endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR)
 if(NOT DEFINED CONTROLLER_PLUGIN_DIR)
-	set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control")
+	set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/control")
 endif(NOT DEFINED CONTROLLER_PLUGIN_DIR)

 ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON)
@@ -149,7 +149,7 @@ endif(WITH_TESTS)
 
 configure_package_config_file ( 
     ${CMAKE_SOURCE_DIR}/cmake/AudioManagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerConfig.cmake
-    INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
     PATH_VARS AUDIO_INCLUDE_FOLDER )
                               
 write_basic_package_version_file(
@@ -169,5 +169,5 @@ add_subdirectory (AudioManagerDaemon)
 install(
     FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake
           ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/AudioManager-${DAEMONVERSION}
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION}
 )

-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel)     
+install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/audiomanagerconfig.h
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX}
     COMPONENT dev)
-- 
1.9.1