Change plugin path to %{_libdir}/dpm/plugins 24/185124/3 accepted/tizen_5.0_unified tizen_5.0 accepted/tizen/5.0/unified/20190418.020748 submit/tizen_5.0/20190411.065139
authorJaemin Ryu <jm77.ryu@samsung.com>
Thu, 26 Jul 2018 06:30:46 +0000 (15:30 +0900)
committerJaemin Ryu <jm77.ryu@samsung.com>
Mon, 17 Dec 2018 09:39:20 +0000 (18:39 +0900)
Change-Id: I808b13a111bfc5b4579321a0e6b9d4ad1c178de2
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>
CMakeLists.txt
packaging/dpm-zone.spec
plugin/CMakeLists.txt

index a786284..a1fd7fa 100755 (executable)
@@ -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})
index fad7bcf..ea5b143 100755 (executable)
@@ -20,7 +20,7 @@ The dpm-zone package provides zone policy module for device policy manager
 %files
 %manifest dpm-zone.manifest
 %defattr(644,root,root,755)
-%attr(755,root,root) /opt/data/dpm/plugins/zone
+%attr(755,root,root) %{_libdir}/dpm/plugins/zone
 %attr(755,root,root) %{_libdir}/libdpm-zone.so.%{version}
 %{_libdir}/libdpm-zone.so.0
 
@@ -37,6 +37,7 @@ The dpm-zone package provides zone 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 \
index 7ec6e64..86ac78a 100755 (executable)
@@ -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-zone.so RENAME zone DESTINATION /opt/data/dpm/plugins)
+INSTALL(FILES libdpm-plugin-zone.so RENAME zone DESTINATION ${PLUGIN_INSTALL_DIR})