From 2daa46c019af18dda4d718f38abeeb6beacdf9c5 Mon Sep 17 00:00:00 2001 From: Fancy Zhang Date: Wed, 5 Aug 2020 22:47:52 +0800 Subject: [PATCH] directly use CMAKE_INSTALL_FULL_XX - CMAKE_INSTALL_XX and CMAKE_INSTALL_FULL_XX result the same effect in intall(...), so why not use CMAKE_INSTALL_FULL_XX directly - install systemd service to fixed /usr/lib/ path, according to the systemd unit doc --- CMakeLists.txt | 6 +++--- execsnoop-kernel/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ab2af..3c16861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,10 +34,10 @@ configure_file(cgproxy.service.cmake cgproxy.service) # instal scripts and other things install(PROGRAMS ${CMAKE_BINARY_DIR}/cgproxyd TYPE BIN) install(PROGRAMS ${CMAKE_BINARY_DIR}/cgnoproxy TYPE BIN) -install(PROGRAMS cgroup-tproxy.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/cgproxy/scripts) -install(FILES ${CMAKE_BINARY_DIR}/cgproxy.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system) +install(PROGRAMS cgroup-tproxy.sh DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/cgproxy/scripts) +install(FILES ${CMAKE_BINARY_DIR}/cgproxy.service DESTINATION /usr/lib/systemd/system) install(FILES config.json DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/cgproxy) -install(FILES readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) +install(FILES readme.md DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}) # man pages set(man_gz ${PROJECT_SOURCE_DIR}/man/cgproxyd.1.gz ${PROJECT_SOURCE_DIR}/man/cgproxy.1.gz ${PROJECT_SOURCE_DIR}/man/cgnoproxy.1.gz) diff --git a/execsnoop-kernel/CMakeLists.txt b/execsnoop-kernel/CMakeLists.txt index 1b3bf0e..2c1ca86 100644 --- a/execsnoop-kernel/CMakeLists.txt +++ b/execsnoop-kernel/CMakeLists.txt @@ -7,7 +7,7 @@ endif() if (build_execsnoop_dl) add_library(execsnoop MODULE execsnoop_share.cpp) - install(TARGETS execsnoop DESTINATION ${CMAKE_INSTALL_LIBDIR}/cgproxy/) + install(TARGETS execsnoop DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cgproxy/) target_link_libraries(execsnoop PRIVATE ${LIBBPF} -lelf -lz) else() add_library(execsnoop STATIC execsnoop_share.cpp)