From 11d09a5b7f1ee4205cb7a28ecad9bb0095b6e9bb Mon Sep 17 00:00:00 2001 From: Jaemin Ryu Date: Thu, 26 Jul 2018 15:27:33 +0900 Subject: [PATCH] Change plugin path to %{_libdir}/dpm/plugins Change-Id: I0e2762864ed602bf5d671cc2a7ee19c46445237f Signed-off-by: Jaemin Ryu --- CMakeLists.txt | 4 ++++ packaging/dpm-usb.spec | 3 ++- plugin/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acda325..56ecdf0 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-usb.spec b/packaging/dpm-usb.spec index f979a20..bad671b 100755 --- a/packaging/dpm-usb.spec +++ b/packaging/dpm-usb.spec @@ -19,7 +19,7 @@ The dpm-usb package provides USB policy module for device policy manager %files %manifest dpm-usb.manifest %defattr(644,root,root,755) -%attr(755,root,root) /opt/data/dpm/plugins/usb +%attr(755,root,root) %{_libdir}/dpm/plugins/usb %attr(755,root,root) %{_libdir}/libdpm-usb.so.%{version} %{_libdir}/libdpm-usb.so.0 @@ -36,6 +36,7 @@ The dpm-usb package provides USB 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 728f98c..001d7c4 100755 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -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-usb.so RENAME usb DESTINATION /opt/data/dpm/plugins) +INSTALL(FILES libdpm-plugin-usb.so RENAME usb DESTINATION ${PLUGIN_INSTALL_DIR}) -- 2.34.1