From 80792ff12a147a572981b5b4ceed7074a09143e3 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Sat, 13 Jan 2024 21:59:58 +0100 Subject: [PATCH] src/{ebusd,tools}/CMakeLists.txt: remove usr path /usr should not be hardcoded, as otherwise this will cause a double prefix during installation. The correct prefix is already being handled by CMAKE_INSTALL_PREFIX. Example: >>> /usr/usr/bin/ebuspicloader >>> /usr/usr/bin/ebusctl >>> /usr/usr/bin/ebusd Signed-off-by: Conrad Kostecki --- src/ebusd/CMakeLists.txt | 2 +- src/tools/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ebusd/CMakeLists.txt b/src/ebusd/CMakeLists.txt index ae34c07f..e8e56e47 100644 --- a/src/ebusd/CMakeLists.txt +++ b/src/ebusd/CMakeLists.txt @@ -36,5 +36,5 @@ include_directories(../lib/utils) add_executable(ebusd ${ebusd_SOURCES}) target_link_libraries(ebusd utils ebus pthread rt ${ebusd_LIBS}) -install(TARGETS ebusd EXPORT ebusd DESTINATION usr/bin) +install(TARGETS ebusd EXPORT ebusd DESTINATION bin) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 38ea734a..2537ad37 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -12,4 +12,4 @@ add_executable(ebuspicloader ${ebuspicloader_SOURCES}) target_link_libraries(ebusctl utils ebus ${ebusctl_LIBS}) target_link_libraries(ebuspicloader utils ${ebuspicloader_LIBS}) -install(TARGETS ebusctl ebuspicloader EXPORT ebusd DESTINATION usr/bin) +install(TARGETS ebusctl ebuspicloader EXPORT ebusd DESTINATION bin)