From: Jaemin Ryu Date: Thu, 26 Jul 2018 06:07:20 +0000 (+0900) Subject: Change plugin path to %{_libdir}/dpm/plugins X-Git-Tag: accepted/tizen/5.0/unified/20190418.020731^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_6.0_unified_hotfix;p=platform%2Fcore%2Fsecurity%2Fdpm-application.git Change plugin path to %{_libdir}/dpm/plugins Change-Id: Iff49c078034f214c6904330f9979a25a90dabe0e Signed-off-by: Jaemin Ryu --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5805a43..4109436 100755 --- 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-application.spec b/packaging/dpm-application.spec index 94a7537..4cb1041 100755 --- a/packaging/dpm-application.spec +++ b/packaging/dpm-application.spec @@ -21,7 +21,7 @@ The dpm-application package provides a application policy module for device poli %files %manifest dpm-application.manifest %defattr(644,root,root,755) -%attr(755,root,root) /opt/data/dpm/plugins/application +%attr(755,root,root) %{_libdir}/dpm/plugins/application %attr(755,root,root) %{_libdir}/libdpm-application.so.%{version} %{_libdir}/libdpm-application.so.0 @@ -38,6 +38,7 @@ The dpm-application package provides a application policy module for device poli %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 e6ee70f..c145521 100755 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -31,4 +31,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-application.so RENAME application DESTINATION /opt/data/dpm/plugins) +INSTALL(FILES libdpm-plugin-application.so RENAME application DESTINATION ${PLUGIN_INSTALL_DIR})