From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 19 May 2016 13:40:29 +0000 (+0200)
Subject: improves compatibility with yocto
X-Git-Tag: blowfish_2.0.1~99
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=commitdiff_plain;h=ae7f9ff4ba5f58c90cd0b9f4ed17978b66a9c0b2

improves compatibility with yocto

Change-Id: I6458dd1e66b96c564d67304fc8f193772914499b
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 373a60e0..fcd376c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,10 +61,9 @@ SET(link_libraries
 	${json-c_LIBRARIES}
 	)
 
-SET(plugin_install_dir ${CMAKE_INSTALL_LIBDIR}/afb)
-SET(plugin_full_install_dir ${CMAKE_INSTALL_PREFIX}/${plugin_install_dir})
+SET(plugin_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb)
 
-ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_full_install_dir}")
+ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}")
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
@@ -77,6 +76,6 @@ CONFIGURE_FILE(afb-daemon.pc.in afb-daemon.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/afb-daemon.pc
     DESTINATION
-    ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig
     )
 
diff --git a/afb-daemon.pc.in b/afb-daemon.pc.in
index ada05afe..196324ab 100644
--- a/afb-daemon.pc.in
+++ b/afb-daemon.pc.in
@@ -17,10 +17,8 @@
 ## limitations under the License.
 ##
 
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-plugin_install_dir=${prefix}/@plugin_install_dir@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+plugin_install_dir=@plugin_install_dir@
 
 Name: @PROJECT_PRETTY_NAME@
 Description: @PROJECT_DESCRIPTION@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3ea557f5..94ed5a56 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ TARGET_LINK_LIBRARIES(afb-daemon
 	-lrt
 )
 INSTALL(TARGETS afb-daemon
-        RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 ADD_EXECUTABLE(afb-client-demo afb-client-demo.c)
 TARGET_LINK_LIBRARIES(afb-client-demo
@@ -71,4 +71,4 @@ TARGET_LINK_LIBRARIES(afb-client-demo
 	${libsystemd_LIBRARIES}
 )
 INSTALL(TARGETS afb-client-demo
-        RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})