diff options
author | Jaemin Ryu <jm77.ryu@samsung.com> | 2018-07-26 15:07:20 +0900 |
---|---|---|
committer | Jaemin Ryu <jm77.ryu@samsung.com> | 2018-12-17 18:42:15 +0900 |
commit | 7f7d56fc3e190f653919c3533a048832d258860e (patch) | |
tree | 7d7015a438ed5d50a4200e1fbdef17cb818d6298 | |
parent | 74144e16cba3298336ddeba1df6e51c9221f6fbf (diff) | |
download | dpm-application-accepted/tizen_7.0_unified.tar.gz dpm-application-accepted/tizen_7.0_unified.tar.bz2 dpm-application-accepted/tizen_7.0_unified.zip |
Change plugin path to %{_libdir}/dpm/pluginstizen_9.0_m2_releasetizen_8.0_m2_releasetizen_7.0_m2_releasetizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.162401submit/tizen_6.0_hotfix/20201103.114804submit/tizen_6.0_hotfix/20201102.192504submit/tizen_6.0/20201029.205104submit/tizen_5.5_wearable_hotfix/20201026.184304submit/tizen_5.5_mobile_hotfix/20201026.185104submit/tizen_5.5/20191031.000004submit/tizen_5.0/20190411.065139submit/tizen/20190411.064623accepted/tizen/unified/20190412.124614accepted/tizen/9.0/unified/20241030.233420accepted/tizen/8.0/unified/20231005.093609accepted/tizen/7.0/unified/hotfix/20221116.105540accepted/tizen/7.0/unified/20221110.061448accepted/tizen/6.5/unified/20211028.122813accepted/tizen/6.0/unified/hotfix/20201103.003843accepted/tizen/6.0/unified/20201030.114936accepted/tizen/5.5/unified/wearable/hotfix/20201027.113231accepted/tizen/5.5/unified/mobile/hotfix/20201027.090554accepted/tizen/5.5/unified/20191031.022908accepted/tizen/5.0/unified/20190418.020731tizen_9.0tizen_8.0tizen_7.0_hotfixtizen_7.0tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0tizenaccepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unifiedaccepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Change-Id: Iff49c078034f214c6904330f9979a25a90dabe0e
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>
-rwxr-xr-x | CMakeLists.txt | 4 | ||||
-rwxr-xr-x | packaging/dpm-application.spec | 3 | ||||
-rwxr-xr-x | plugin/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 2 deletions
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}) |