From 9d26ccbff0dc33114370c84022211bd8b966afef Mon Sep 17 00:00:00 2001 From: saerome kim Date: Wed, 7 Jun 2017 19:39:26 +0900 Subject: [PATCH] Remove codes to copy license files manually. Change-Id: Ie23c267824238098715726fc48ccfd17bd4aa8c0 Signed-off-by: saerome kim --- packaging/zigbee-manager.spec | 2 -- zigbee-client/CMakeLists.txt | 1 - zigbee-daemon/CMakeLists.txt | 1 - zigbee-daemon/zigbee-lib/CMakeLists.txt | 1 - 4 files changed, 5 deletions(-) diff --git a/packaging/zigbee-manager.spec b/packaging/zigbee-manager.spec index 57a94e4..e0182d4 100644 --- a/packaging/zigbee-manager.spec +++ b/packaging/zigbee-manager.spec @@ -81,7 +81,6 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf %attr(755,system,system) %{_bindir}/zigbee-daemon %{_unitdir}/zigbee-daemon.service #%{_unitdir}/multi-user.target.wants/zigbee-daemon.service -%{_datadir}/license/zigbee-daemon %attr(644,root,root) %{_datadir}/dbus-1/system-services/* %if %{CHECK_ZIGBEE_PRIVILEGE} == "True" %{_datadir}/dbus-1/system.d/zigbee.conf @@ -91,7 +90,6 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf %files -n zigbee-lib %defattr(644,system,system,-) %{_libdir}/libzigbee-lib.so* -%{_datadir}/license/zigbee-lib %license LICENSE %files -n zigbee-lib-devel diff --git a/zigbee-client/CMakeLists.txt b/zigbee-client/CMakeLists.txt index aaeed6c..94a738d 100644 --- a/zigbee-client/CMakeLists.txt +++ b/zigbee-client/CMakeLists.txt @@ -51,7 +51,6 @@ CONFIGURE_FILE(zigbee-client.pc.in zigbee-client.pc @ONLY) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/client) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-client.pc DESTINATION ${LIBDIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-client) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT Runtime) IF (TIZEN_ENGINEER_MODE) ADD_SUBDIRECTORY(test_src) diff --git a/zigbee-daemon/CMakeLists.txt b/zigbee-daemon/CMakeLists.txt index 09a577f..0a44dbf 100644 --- a/zigbee-daemon/CMakeLists.txt +++ b/zigbee-daemon/CMakeLists.txt @@ -103,5 +103,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} zigbee-service zigbee-interface ${pkgs_LDF ### Install files ### INSTALL(TARGETS zigbee-lib DESTINATION ${LIBDIR} COMPONENT Runtime) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-daemon) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION ${UNITDIR}) diff --git a/zigbee-daemon/zigbee-lib/CMakeLists.txt b/zigbee-daemon/zigbee-lib/CMakeLists.txt index fb40778..d562c6f 100644 --- a/zigbee-daemon/zigbee-lib/CMakeLists.txt +++ b/zigbee-daemon/zigbee-lib/CMakeLists.txt @@ -40,5 +40,4 @@ CONFIGURE_FILE(zigbee-lib.pc.in zigbee-lib.pc @ONLY) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/lib) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-lib.pc DESTINATION ${LIBDIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-lib) #INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime) -- 2.7.4