Change plugin path to %{_libdir}/dpm/plugins

Change-Id: I6d591d6e7f78df9f90599ff720e3b4720a89c22d
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4f8137042c7332ac7e826aff8353f36c421596a..ec4f53200d8b9b29c75c5d5c050c8f305d03075d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,10 @@ IF(NOT DEFINED SYSTEMD_UNIT_INSTALL_DIR)
        SET(SYSTEMD_UNIT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
 ENDIF(NOT DEFINED SYSTEMD_UNIT_INSTALL_DIR)
 
+IF(NOT DEFINED PLUGIN_INSTALL_DIR)
+       SET(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/dpm/plugins")
+ENDIF(NOT DEFINED PLUGIN_INSTALL_DIR)
+
 ADD_DEFINITIONS(-DUG_WAYLAND)
 
 ADD_SUBDIRECTORY(${DPM_PLUGIN})

diff --git a/packaging/dpm-telephony.spec b/packaging/dpm-telephony.spec
index 13c6ba53425f14df3549b9d5233231331a29c606..daf3ed7e322ec7eb6bcf4a6ebb8e0bbef38468c7 100755 (executable)
--- a/packaging/dpm-telephony.spec
+++ b/packaging/dpm-telephony.spec
@@ -19,7 +19,7 @@ The dpm-telephony package provides telephony policy module for device policy man
 %files
 %manifest dpm-telephony.manifest
 %defattr(644,root,root,755)
-%attr(755,root,root) /opt/data/dpm/plugins/telephony
+%attr(755,root,root) /usr/lib/dpm/plugins/telephony
 %attr(755,root,root) %{_libdir}/libdpm-telephony.so.%{version}
 %{_libdir}/libdpm-telephony.so.0
 
@@ -36,6 +36,7 @@ The dpm-telephony package provides telephony policy module for device policy man
 
 %cmake . -DVERSION=%{version} \
          -DCMAKE_BUILD_TYPE=%{build_type} \
+         -DPLUGIN_INSTALL_DIR=%{_libdir}/dpm/plugins \
          -DSCRIPT_INSTALL_DIR=%{_scriptdir} \
          -DSYSTEMD_UNIT_INSTALL_DIR=%{_unitdir} \
          -DDATA_INSTALL_DIR=%{TZ_SYS_DATA}/dpm \

diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 46bcee44cf1e497ccdddbe978c84a83bfb22fc7a..208daac17d0d9a950d7ba2ea9661f18ac545e8ee 100755 (executable)
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_FLAGS "-fvisibility=default")
 INCLUDE_DIRECTORIES(SYSTEM ${PLUGIN_DEPS_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${TARGET} ${PLUGIN_DEPS_LIBRARIES})
 
-INSTALL(FILES libdpm-plugin-telephony.so RENAME telephony DESTINATION /opt/data/dpm/plugins)
+INSTALL(FILES libdpm-plugin-telephony.so RENAME telephony DESTINATION ${PLUGIN_INSTALL_DIR})