Fix hardcoded lib path and use %cmake macros

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb5028e..342b34e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE(BuildFlags.cmake)
 SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PLUGINDIR "${PREFIX}/lib/${PROJECT_NAME}")
+SET(PLUGINDIR "${LIB_INSTALL_DIR}/${PROJECT_NAME}")
 
 # get library version from debian/changelog
 get_version(debian/changelog VERSION VERSION_MAJOR)

diff --git a/packaging/sync-agent.spec b/packaging/sync-agent.spec
index 6cdff9b..da91c6f 100755 (executable)
--- a/packaging/sync-agent.spec
+++ b/packaging/sync-agent.spec
@@ -75,7 +75,7 @@ common public plugins for sync-agent
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+%cmake .
 
 
 make %{?jobs:-j%jobs}
@@ -109,5 +109,5 @@ rm -rf %{buildroot}
 %files -n common-public-plugins
 %manifest common-public-plugins.manifest
 %defattr(-,root,root,-)
-/usr/lib/sync-agent/common-public/*
+%{_libdir}/sync-agent/common-public/*
 

diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index f1c4e21..372b2fe 100755 (executable)
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -8,7 +8,7 @@
 PROJECT(sync-agent)
 
 SET(LIBNAME "lib${PROJECT_NAME}")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR "${LIB_INSTALL_DIR}")
 
 # set variables
 SET(FW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../include")
@@ -84,11 +84,11 @@ SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 #
 
 # install library files
-INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIBDIR})
+INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIB_INSTALL_DIR})
 
 # install .pc file
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 # install header files
 INSTALL(FILES ${FW_INCLUDE_DIR}/sync_agent.h DESTINATION include/)

diff --git a/src/framework/sync-agent.pc.in b/src/framework/sync-agent.pc.in
index 280349b..3cc0484 100755 (executable)
--- a/src/framework/sync-agent.pc.in
+++ b/src/framework/sync-agent.pc.in
@@ -1,7 +1,7 @@
 
 prefix=@PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: sync-agent

diff --git a/src/fw-plugins/CMakeLists.sub b/src/fw-plugins/CMakeLists.sub
index 8040b54..097632c 100755 (executable)
--- a/src/fw-plugins/CMakeLists.sub
+++ b/src/fw-plugins/CMakeLists.sub
@@ -53,5 +53,5 @@ SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 #
 
 # install library files
-INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIBDIR})
+INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/src/fw-plugins/common-private/CMakeLists.txt b/src/fw-plugins/common-private/CMakeLists.txt
index 46d6ce9..cd57069 100755 (executable)
--- a/src/fw-plugins/common-private/CMakeLists.txt
+++ b/src/fw-plugins/common-private/CMakeLists.txt
@@ -3,7 +3,7 @@
 SET(PLUGIN_CATEGORY_NAME "common-private")
 
 # set plugin install path
-SET(LIBDIR "${PREFIX}/lib/sync-agent/${PLUGIN_CATEGORY_NAME}")
+SET(LIBDIR "${LIB_INSTALL_DIR}/sync-agent/${PLUGIN_CATEGORY_NAME}")
 
 ADD_SUBDIRECTORY(slp-mdm)
 

diff --git a/src/fw-plugins/common-public/CMakeLists.txt b/src/fw-plugins/common-public/CMakeLists.txt
index 1f40bae..8f73c75 100755 (executable)
--- a/src/fw-plugins/common-public/CMakeLists.txt
+++ b/src/fw-plugins/common-public/CMakeLists.txt
@@ -3,7 +3,7 @@
 SET(PLUGIN_CATEGORY_NAME "common-public")
 
 # set plugin install path
-SET(LIBDIR "${PREFIX}/lib/sync-agent/${PLUGIN_CATEGORY_NAME}")
+SET(LIBDIR "${LIB_INSTALL_DIR}/sync-agent/${PLUGIN_CATEGORY_NAME}")
 
 ADD_SUBDIRECTORY(account)
 ADD_SUBDIRECTORY(calendar)

diff --git a/test/dummy_project/CMakeLists.txt b/test/dummy_project/CMakeLists.txt
index da03f3e..b9b2621 100644 (file)
--- a/test/dummy_project/CMakeLists.txt
+++ b/test/dummy_project/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE(BuildFlags.cmake)
 SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PLUGINDIR "${PREFIX}/lib/${PROJECT_NAME}")
+SET(PLUGINDIR "${LIB_INSTALL_DIR}/${PROJECT_NAME}")
 
 # get library version from debian/changelog
 get_version(debian/changelog VERSION VERSION_MAJOR)

diff --git a/test/dummy_project/packaging/dummy-agent.spec b/test/dummy_project/packaging/dummy-agent.spec
index 6f5848f..37089be 100755 (executable)
--- a/test/dummy_project/packaging/dummy-agent.spec
+++ b/test/dummy_project/packaging/dummy-agent.spec
@@ -32,7 +32,7 @@ dummy plugins for sync-agent
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 make %{?jobs:-j%jobs}
 
 
@@ -71,4 +71,4 @@ rm -rf /usr/share/oma-ds-cfg
 %files -n dummy-plugins
 %manifest dummy-plugins.manifest
 %defattr(-,root,root,-)
-/usr/lib/sync-agent/dummy/*
+%{_libdir}/sync-agent/dummy/*

diff --git a/test/dummy_project/src/plugins/CMakeLists.sub b/test/dummy_project/src/plugins/CMakeLists.sub
index 8040b54..097632c 100644 (file)
--- a/test/dummy_project/src/plugins/CMakeLists.sub
+++ b/test/dummy_project/src/plugins/CMakeLists.sub
@@ -53,5 +53,5 @@ SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 #
 
 # install library files
-INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIBDIR})
+INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/test/dummy_project/src/plugins/dummy/CMakeLists.txt b/test/dummy_project/src/plugins/dummy/CMakeLists.txt
index 33bbbfe..8fa4998 100755 (executable)
--- a/test/dummy_project/src/plugins/dummy/CMakeLists.txt
+++ b/test/dummy_project/src/plugins/dummy/CMakeLists.txt
@@ -3,7 +3,7 @@
 SET(PLUGIN_CATEGORY_NAME "dummy")
 
 # set plugin install path
-SET(LIBDIR "${PREFIX}/lib/sync-agent/${PLUGIN_CATEGORY_NAME}")
+SET(LIBDIR "${LIB_INSTALL_DIR}/sync-agent/${PLUGIN_CATEGORY_NAME}")
 
 ADD_SUBDIRECTORY(da-dummy)
 ADD_SUBDIRECTORY(di-dummy)