From: Jaemin Ryu Date: Thu, 26 Jul 2018 06:09:25 +0000 (+0900) Subject: Change plugin path to %{_libdir}/dpm/plguins X-Git-Tag: submit/tizen/20190222.075321~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e64f0491052d24bc926f1b7d82b0169ae0cf77d9;p=platform%2Fcore%2Fsecurity%2Fdpm-auth.git Change plugin path to %{_libdir}/dpm/plguins Change-Id: Ie4f2e02a8674a063d6a8971f0dde8f4033bca23a Signed-off-by: Jaemin Ryu --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b738b49..82899b3 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-auth.spec b/packaging/dpm-auth.spec index c54fe99..81f4ab7 100755 --- a/packaging/dpm-auth.spec +++ b/packaging/dpm-auth.spec @@ -20,7 +20,7 @@ The dpm-auth package provides authentication policy module for device policy man %files %manifest dpm-auth.manifest %defattr(644,root,root,755) -%attr(755,root,root) /opt/data/dpm/plugins/auth +%attr(755,root,root) %{_libdir}/dpm/plugins/auth %attr(755,root,root) %{_libdir}/libdpm-auth.so.%{version} %{_libdir}/libdpm-auth.so.0 @@ -37,6 +37,7 @@ The dpm-auth package provides authentication 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 2a441c7..1df6564 100755 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -33,4 +33,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-auth.so RENAME auth DESTINATION /opt/data/dpm/plugins) +INSTALL(FILES libdpm-plugin-auth.so RENAME auth DESTINATION ${PLUGIN_INSTALL_DIR})