From 90b9664325046a121cf5442c839f31c75bb4a682 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 12:32:48 +0800 Subject: [PATCH] CMakeLists.txt: fix udev rule path and clean other path Fix QA Notice: udev rules should be installed in /lib/udev/rules.d /lib/udev/rules.d is for upstream packager and /etc/udev/rules.d is for user. This is intended to make life for distro packagers easier. Udev rule file should have two digit integer prefix, and this hardware may use 60 as the prefix. Closes: https://github.com/DreamSourceLab/DSView/issues/190 Signed-off-by: Huang Rui --- DSView/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 9d129169..554952fa 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -420,7 +420,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ #------------------------------------------------------------------------------- # Install the executable. -install(TARGETS ${PROJECT_NAME} DESTINATION bin/) +install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg) install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg) @@ -429,8 +429,8 @@ install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25) install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/ RENAME dsview.desktop) +install(FILES DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +install(FILES DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) #=============================================================================== #= Packaging (handled by CPack)