From d82f57eca2f24bf0cb88571e9c51b635db22215f Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Wed, 14 Apr 2021 14:04:07 +0900 Subject: [PATCH] [TSYSTEM-1043] Change install path to hal folder Change-Id: I48b4aab302dfb2544a4480c0865123f4e1eac4cd Signed-off-by: Jihoon Jung --- CMakeLists.txt | 3 ++- packaging/nfc-plugin-emul.spec | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 871cbea..2fb5fdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,4 +15,5 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PUBLIC ${pkgs_CFLAGS_OTHER}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LIBRARIES} pthread) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_PATH}) -INSTALL(FILES 98-nfc-plugin-emul.rules DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d/) +INSTALL(FILES 98-nfc-plugin-emul.rules DESTINATION ${HAL_PATH}/udev/rules.d/) +INSTALL(FILES LICENSE.APLv2 DESTINATION ${HAL_LICENSE_PATH}) diff --git a/packaging/nfc-plugin-emul.spec b/packaging/nfc-plugin-emul.spec index f0ca530..e60ef17 100644 --- a/packaging/nfc-plugin-emul.spec +++ b/packaging/nfc-plugin-emul.spec @@ -21,7 +21,8 @@ cp %{SOURCE1001} ./%{name}.manifest %build %cmake . -DCMAKE_VERBOSE_MAKEFILE=OFF \ - -DHAL_PATH=%{_hal_libdir} + -DHAL_PATH=%{_hal_libdir} \ + -DHAL_LICENSE_PATH=%{_hal_licensedir} make %{?_smp_mflags} %install @@ -30,5 +31,5 @@ make %{?_smp_mflags} %files %manifest %{name}.manifest %{_hal_libdir}/*.so* -%{_prefix}/lib/udev/rules.d/98-%{name}.rules -%license LICENSE.APLv2 +%{_hal_libdir}/udev/rules.d/98-%{name}.rules +%license %{_hal_licensedir}/LICENSE.APLv2 -- 2.7.4