From: Jaemin Ryu Date: Thu, 26 Jul 2018 06:28:54 +0000 (+0900) Subject: Change plugin path to %{_libdir}/dpm/plugins X-Git-Tag: submit/tizen/20190411.064623^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_unified;p=platform%2Fcore%2Fsecurity%2Fdpm-wifi.git Change plugin path to %{_libdir}/dpm/plugins Change-Id: I7f68932e14eac791efe123eb30f5dede02f6bfae Signed-off-by: Jaemin Ryu --- diff --git a/CMakeLists.txt b/CMakeLists.txt index abd8d2c..1f80c9a 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-wifi.spec b/packaging/dpm-wifi.spec index 66e96a4..ff51d83 100755 --- a/packaging/dpm-wifi.spec +++ b/packaging/dpm-wifi.spec @@ -21,7 +21,7 @@ The dpm-wifi package provides Wi-Fi policy module for device policy manager %files %manifest dpm-wifi.manifest %defattr(644,root,root,755) -%attr(755,root,root) /opt/data/dpm/plugins/wifi +%attr(755,root,root) %{_libdir}/dpm/plugins/wifi %attr(755,root,root) %{_libdir}/libdpm-wifi.so.%{version} %{_libdir}/libdpm-wifi.so.0 @@ -38,6 +38,7 @@ The dpm-wifi package provides Wi-Fi 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 2131c00..d895cf0 100755 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -32,4 +32,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-wifi.so RENAME wifi DESTINATION /opt/data/dpm/plugins) +INSTALL(FILES libdpm-plugin-wifi.so RENAME wifi DESTINATION ${PLUGIN_INSTALL_DIR})