From 882c6c94ea3d2f817eee5bd72aa83209357587af Mon Sep 17 00:00:00 2001 From: Mark Stemm Date: Thu, 10 Nov 2016 10:00:26 -0800 Subject: [PATCH] Fully specify FALCO_SHARE_DIR. Instead of having FALCO_SHARE_DIR be a relative path, fully specify it by prepending CMAKE_INSTALL_PREFIX in the top level CMakeLists.txt and don't prepend CMAKE_INSTALL_PREFIX in config_falco_engine.h.in. This makes it consistent with its use in the agent. --- CMakeLists.txt | 2 +- userspace/engine/config_falco_engine.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8694ecb1..aaed22ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,7 +365,7 @@ add_subdirectory("${SYSDIG_DIR}/userspace/libsinsp" "${PROJECT_BINARY_DIR}/users add_subdirectory(scripts) set(FALCO_SINSP_LIBRARY sinsp) -set(FALCO_SHARE_DIR share/falco) +set(FALCO_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/falco) add_subdirectory(userspace/engine) add_subdirectory(userspace/falco) diff --git a/userspace/engine/config_falco_engine.h.in b/userspace/engine/config_falco_engine.h.in index 56ad1508..137b9a26 100644 --- a/userspace/engine/config_falco_engine.h.in +++ b/userspace/engine/config_falco_engine.h.in @@ -18,5 +18,5 @@ along with falco. If not, see . #pragma once -#define FALCO_ENGINE_LUA_DIR "${CMAKE_INSTALL_PREFIX}/${FALCO_SHARE_DIR}/lua/" +#define FALCO_ENGINE_LUA_DIR "${FALCO_SHARE_DIR}/lua/" #define FALCO_ENGINE_SOURCE_LUA_DIR "${PROJECT_SOURCE_DIR}/../falco/userspace/engine/lua/"