3.0 migration

Change-Id: I0df84acf16338c44c05055bb2a3c5a3c3aff1ab7
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11fd117..100ff2f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 ##########################################################
 # Set Variables
 ##########################################################
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(VOBJECT-LIB msg_vobject)
 SET(UTILS-LIB msg_utils)
 SET(EXTERNALS-LIB msg_externals)
@@ -62,7 +63,7 @@ INSTALL(FILES ${MAPI-HEADERS} DESTINATION include/msg-service)
 #INSTALL(FILES ${MMS-FILES} DESTINATION /opt/etc/msg-service)
 
 CONFIGURE_FILE(msg-service.pc.in msg-service.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/msg-service.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/msg-service.pc DESTINATION ${LIBDIR}/pkgconfig)
 
 # LICENSE file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/msg-service)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index cc8eef5..9f49019 100755 (executable)
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -50,5 +50,5 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${EXTERNALS-LIB} SHARED ${EXTERNALS-SRCS})
 TARGET_LINK_LIBRARIES(${EXTERNALS-LIB} ${externals_pkgs_LDFLAGS} rt ${UTILS-LIB} ${VOBJECT-LIB})
 
-INSTALL(TARGETS ${EXTERNALS-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${EXTERNALS-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index b83d5f4..bc39d74 100755 (executable)
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -41,7 +41,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${PLUGIN-MANAGER-LIB} SHARED ${PLUGIN-MANAGER-SRCS})
 TARGET_LINK_LIBRARIES(${PLUGIN-MANAGER-LIB} ${plugin_manager_pkgs_LDFLAGS} ${UTILS-LIB} dl)
 
-INSTALL(TARGETS ${PLUGIN-MANAGER-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${PLUGIN-MANAGER-LIB} LIBRARY DESTINATION ${LIBDIR})
 
 ##########################################################
 # Define Messaging Framework Handler
@@ -85,7 +85,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${FW-HANDLER-LIB} SHARED ${FW-HANDLER-SRCS})
 TARGET_LINK_LIBRARIES(${FW-HANDLER-LIB} ${fw_handler_pkgs_LDFLAGS} ${UTILS-LIB} ${EXTERNALS-LIB} ${PLUGIN-MANAGER-LIB})
 
-INSTALL(TARGETS ${FW-HANDLER-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${FW-HANDLER-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 
 ##########################################################
 # Define Transaction Manager
@@ -123,7 +123,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${TRANS-MANAGER-LIB} SHARED ${TRANS-MANAGER-SRCS})
 TARGET_LINK_LIBRARIES(${TRANS-MANAGER-LIB} ${trans_manager_pkgs_LDFLAGS} ${UTILS-LIB} ${EXTERNALS-LIB} ${FW-HANDLER-LIB})
 
-INSTALL(TARGETS ${TRANS-MANAGER-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${TRANS-MANAGER-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 
 ##########################################################
 # Define Execute File

diff --git a/mapi/CMakeLists.txt b/mapi/CMakeLists.txt
index 3f2150f..7f9b391 100755 (executable)
--- a/mapi/CMakeLists.txt
+++ b/mapi/CMakeLists.txt
@@ -52,5 +52,5 @@ TARGET_LINK_LIBRARIES(${MAPI-LIB} ${mapi_pkgs_LDFLAGS} ${UTILS-LIB} ${TRANS-PROX
 SET_TARGET_PROPERTIES(${MAPI-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${MAPI-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${MAPI-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${MAPI-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 

diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec
index 4cb7c0e..a304d19 100755 (executable)
--- a/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@ -112,6 +112,7 @@ Description: MMS plugin library
 
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DLIB_INSTALL_DIR=%{_libdir} \
 %ifarch i586
 -D_TIZEN_I586_ENABLED:BOOL=ON \
 %else
@@ -159,7 +160,7 @@ chown 200:200 %{_libdir}/systemd/system/msg-server.socket
 chmod 660 /opt/usr/dbspace/.msg_service.db
 chmod 660 /opt/usr/dbspace/.msg_service.db-journal
 
-if [ -f /usr/lib/rpm-plugins/msm.so ]
+if [ -f %{_libdir}/rpm-plugins/msm.so ]
 then
        chsmack -a 'msg-service::db' /opt/usr/dbspace/.msg_service.db*
 fi

diff --git a/plugin/mms_plugin/CMakeLists.txt b/plugin/mms_plugin/CMakeLists.txt
index 3b8d801..55dba8b 100755 (executable)
--- a/plugin/mms_plugin/CMakeLists.txt
+++ b/plugin/mms_plugin/CMakeLists.txt
@@ -63,5 +63,5 @@ SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 ADD_LIBRARY(${MMS-PLUGIN-LIB} SHARED ${MMS-PLUGIN-SRCS})
 TARGET_LINK_LIBRARIES(${MMS-PLUGIN-LIB} ${mms_plugin_pkgs_LDFLAGS} ${UTILS-LIB} ${EXTERNALS-LIB})
 
-INSTALL(TARGETS ${MMS-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${MMS-PLUGIN-LIB} LIBRARY DESTINATION ${LIBDIR})
 

diff --git a/plugin/sms_cdma_plugin/CMakeLists.txt b/plugin/sms_cdma_plugin/CMakeLists.txt
index b94c5cf..82f9eef 100755 (executable)
--- a/plugin/sms_cdma_plugin/CMakeLists.txt
+++ b/plugin/sms_cdma_plugin/CMakeLists.txt
@@ -52,6 +52,6 @@ ADD_LIBRARY(${SMS-PLUGIN-LIB} SHARED ${SMS-PLUGIN-SRCS})
 TARGET_LINK_LIBRARIES(${SMS-PLUGIN-LIB} ${sms_plugin_pkgs_LDFLAGS} ${UTILS-LIB} ${EXTERNALS-LIB})
 
 IF(_FEATURE_TELEPHONY_ENABLE)
-INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION ${LIBDIR})
 ENDIF(_FEATURE_TELEPHONY_ENABLE)
 

diff --git a/plugin/sms_plugin/CMakeLists.txt b/plugin/sms_plugin/CMakeLists.txt
index 7c6a0a9..d4129c9 100755 (executable)
--- a/plugin/sms_plugin/CMakeLists.txt
+++ b/plugin/sms_plugin/CMakeLists.txt
@@ -58,5 +58,5 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${SMS-PLUGIN-LIB} SHARED ${SMS-PLUGIN-SRCS})
 TARGET_LINK_LIBRARIES(${SMS-PLUGIN-LIB} ${sms_plugin_pkgs_LDFLAGS} ${UTILS-LIB} ${EXTERNALS-LIB})
 
-INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION ${LIBDIR})
 

diff --git a/proxy/CMakeLists.txt b/proxy/CMakeLists.txt
index 5b864b2..f54e982 100755 (executable)
--- a/proxy/CMakeLists.txt
+++ b/proxy/CMakeLists.txt
@@ -46,5 +46,5 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${TRANS-PROXY-LIB} SHARED ${TRANS-PROXY-SRCS})
 TARGET_LINK_LIBRARIES(${TRANS-PROXY-LIB} ${trans_proxy_pkgs_LDFLAGS} ${UTILS-LIB})
 
-INSTALL(TARGETS ${TRANS-PROXY-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${TRANS-PROXY-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 0209a41..b03abb2 100755 (executable)
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -66,5 +66,5 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${UTILS-LIB} SHARED ${UTILS-SRCS})
 TARGET_LINK_LIBRARIES(${UTILS-LIB} ${utils_pkgs_LDFLAGS} rt ${VOBJECT-LIB})
 
-INSTALL(TARGETS ${UTILS-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${UTILS-LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 

diff --git a/vobject-engine/CMakeLists.txt b/vobject-engine/CMakeLists.txt
index c87b69d..4d875e2 100755 (executable)
--- a/vobject-engine/CMakeLists.txt
+++ b/vobject-engine/CMakeLists.txt
@@ -37,4 +37,4 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_LIBRARY(${VOBJECT-LIB} SHARED ${VOBJECT-SRCS})
 TARGET_LINK_LIBRARIES(${VOBJECT-LIB} ${vobject_pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${VOBJECT-LIB} DESTINATION lib)
+INSTALL(TARGETS ${VOBJECT-LIB} DESTINATION ${LIBDIR})