Change plugin path to %{_libdir}/dpm/plugins 18/185118/4 accepted/tizen_5.0_unified accepted/tizen_5.5_unified accepted/tizen_5.5_unified_mobile_hotfix accepted/tizen_5.5_unified_wearable_hotfix accepted/tizen_6.0_unified accepted/tizen_6.0_unified_hotfix accepted/tizen_6.5_unified accepted/tizen_7.0_unified accepted/tizen_7.0_unified_hotfix accepted/tizen_8.0_unified accepted/tizen_unified tizen tizen_5.0 tizen_5.5 tizen_5.5_mobile_hotfix tizen_5.5_tv tizen_5.5_wearable_hotfix tizen_6.0 tizen_6.0_hotfix tizen_6.5 tizen_7.0 tizen_7.0_hotfix tizen_8.0 accepted/tizen/5.0/unified/20190418.020743 accepted/tizen/5.5/unified/20191031.022742 accepted/tizen/5.5/unified/mobile/hotfix/20201027.090506 accepted/tizen/5.5/unified/wearable/hotfix/20201027.113142 accepted/tizen/6.0/unified/20201030.115044 accepted/tizen/6.0/unified/hotfix/20201103.003724 accepted/tizen/6.5/unified/20211028.121829 accepted/tizen/7.0/unified/20221110.060445 accepted/tizen/7.0/unified/hotfix/20221116.105555 accepted/tizen/8.0/unified/20231005.093626 accepted/tizen/unified/20190412.124633 submit/tizen/20190411.064623 submit/tizen_5.0/20190411.065139 submit/tizen_5.5/20191031.000004 submit/tizen_5.5_mobile_hotfix/20201026.185104 submit/tizen_5.5_wearable_hotfix/20201026.184304 submit/tizen_6.0/20201029.205104 submit/tizen_6.0_hotfix/20201102.192504 submit/tizen_6.0_hotfix/20201103.114804 submit/tizen_6.5/20211028.162401 tizen_5.5.m2_release tizen_6.0.m2_release tizen_6.5.m2_release tizen_7.0_m2_release tizen_8.0_m2_release
authorJaemin Ryu <jm77.ryu@samsung.com>
Thu, 26 Jul 2018 06:24:47 +0000 (15:24 +0900)
committerJaemin Ryu <jm77.ryu@samsung.com>
Mon, 17 Dec 2018 09:44:58 +0000 (18:44 +0900)
Change-Id: I3d7ca040dee91a8f0cc0622ea0b1c884290e1856
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>
CMakeLists.txt
packaging/dpm-storage.spec
plugin/CMakeLists.txt

index 6c6a4b6..9caa692 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 61fcacb..5c77ed2 100755 (executable)
@@ -19,7 +19,7 @@ The dpm-storage package provides storage policy module for device policy manager
 %files
 %manifest dpm-storage.manifest
 %defattr(644,root,root,755)
-%attr(755,root,root) /opt/data/dpm/plugins/storage
+%attr(755,root,root) %{_libdir}/dpm/plugins/storage
 %attr(755,root,root) %{_libdir}/libdpm-storage.so.%{version}
 %{_libdir}/libdpm-storage.so.0
 
@@ -36,6 +36,7 @@ The dpm-storage package provides storage 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 6810db5..cd94101 100755 (executable)
@@ -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-storage.so RENAME storage DESTINATION /opt/data/dpm/plugins)
+INSTALL(FILES libdpm-plugin-storage.so RENAME storage DESTINATION ${PLUGIN_INSTALL_DIR})