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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 719ae2867814b4b54c1abc494b7c224e2eaee928..0d16367cfbbf4e8e8e03c784ab4d443ae3ee230a 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-browser.spec b/packaging/dpm-browser.spec
index 30c6df3bb9d9aed13dcd8a20a742428d01f19979..73898f757f1668131d883d9e3cb5c9da54839abc 100755 (executable)
--- a/packaging/dpm-browser.spec
+++ b/packaging/dpm-browser.spec
@@ -19,7 +19,7 @@ The dpm-browser package provides browser policy module for device policy manager
 %files
 %manifest dpm-browser.manifest
 %defattr(644,root,root,755)
-%attr(755,root,root) /opt/data/dpm/plugins/browser
+%attr(755,root,root) %{_libdir}/dpm/plugins/browser
 %attr(755,root,root) %{_libdir}/libdpm-browser.so.%{version}
 %{_libdir}/libdpm-browser.so.0
 
@@ -36,6 +36,7 @@ The dpm-browser package provides browser policy module for device policy manager
 
 %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 32a940a3278e65e019deb59bd05a14f9ba84e043..3f9eda7edd1b2241f33ec9ccc3d5ac377193af05 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-browser.so RENAME browser DESTINATION /opt/data/dpm/plugins)
+INSTALL(FILES libdpm-plugin-browser.so RENAME browser DESTINATION ${PLUGIN_INSTALL_DIR})