Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt @@ -472,7 +472,7 @@ endif() find_path(HIREDIS_INCLUDES_FOLDER NAMES hiredis/hiredis.h PATHS "${HIREDIS_CUSTOM_INSTALL_PATH}/include" NO_DEFAULT_PATH) # Try to find hiredis library path -find_library(HIREDIS_LIBRARY_PATH NAMES hiredis PATHS "${HIREDIS_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH) +find_library(HIREDIS_LIBRARY_PATH NAMES hiredis) if (HIREDIS_INCLUDES_FOLDER AND HIREDIS_LIBRARY_PATH) message(STATUS "We found hiredis library and will build Redis support ${HIREDIS_INCLUDES_FOLDER} ${HIREDIS_LIBRARY_PATH}") @@ -525,7 +525,7 @@ endif() find_path(LOG4CPP_INCLUDES_FOLDER NAMES log4cpp/Appender.hh PATHS "${LOG4CPP_CUSTOM_INSTALL_PATH}/include" NO_DEFAULT_PATH) # Try to find log4cpp library path -find_library(LOG4CPP_LIBRARY_PATH NAMES log4cpp PATHS "${LOG4CPP_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH) +find_library(LOG4CPP_LIBRARY_PATH NAMES log4cpp) if (LOG4CPP_INCLUDES_FOLDER AND LOG4CPP_LIBRARY_PATH) include_directories(${LOG4CPP_INCLUDES_FOLDER}) @@ -537,7 +537,7 @@ endif() ### Look for jsonc find_path(JSONC_INCLUDES_FOLDER NAMES json-c/json.h PATHS "${JSONC_CUSTOM_INSTALL_PATH}/include" NO_DEFAULT_PATH) -find_library(JSONC_LIBRARY_PATH NAMES json-c PATHS "${JSONC_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH) +find_library(JSONC_LIBRARY_PATH NAMES json-c) if (JSONC_INCLUDES_FOLDER AND JSONC_LIBRARY_PATH) include_directories(${JSONC_INCLUDES_FOLDER}) @@ -665,9 +665,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE set(CMAKE_INSTALL_SBINDIR "bin") set(CMAKE_INSTALL_SYSCONFDIR "etc") else() - set(CMAKE_INSTALL_BINDIR "/usr/bin") - set(CMAKE_INSTALL_SBINDIR "/usr/sbin") - set(CMAKE_INSTALL_SYSCONFDIR "/etc") + set(CMAKE_INSTALL_BINDIR "${PREFIX}/bin") + set(CMAKE_INSTALL_SBINDIR "${PREFIX}/sbin") + set(CMAKE_INSTALL_SYSCONFDIR "${PREFIX}/share/examples/fastnetmon") endif() install(TARGETS fastnetmon DESTINATION "${CMAKE_INSTALL_SBINDIR}") @@ -675,13 +675,9 @@ install(TARGETS fastnetmon_client DESTINATION "${CMAKE install(FILES fastnetmon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") -# Install blank files for networks list and whitelist -install(FILES networks_list DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") -install(FILES networks_whitelist DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") - # man pages -install(FILES man/fastnetmon.1 DESTINATION /usr/share/man/man1) -install(FILES man/fastnetmon_client.1 DESTINATION /usr/share/man/man1) +install(FILES man/fastnetmon.1 DESTINATION ${PREFIX}/man/man1) +install(FILES man/fastnetmon_client.1 DESTINATION ${PREFIX}/man/man1) # service files if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")