From 39b1f6451064d8c4aeddc00722d15e6192ff43c7 Mon Sep 17 00:00:00 2001 From: Henri DF Date: Thu, 31 Mar 2016 21:18:23 -0700 Subject: [PATCH] Packaging: Bundle lua files --- userspace/digwatch/CMakeLists.txt | 6 ++++++ userspace/digwatch/config_digwatch.h.in | 3 ++- userspace/digwatch/digwatch.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/userspace/digwatch/CMakeLists.txt b/userspace/digwatch/CMakeLists.txt index f176c32b..08bc7298 100644 --- a/userspace/digwatch/CMakeLists.txt +++ b/userspace/digwatch/CMakeLists.txt @@ -14,3 +14,9 @@ set(DIGWATCH_LUA_MAIN "rule_loader.lua") configure_file(config_digwatch.h.in config_digwatch.h) install(TARGETS digwatch DESTINATION bin) +install(FILES lua/compiler.lua + DESTINATION share/digwatch/lua) +install(FILES lua/rule_loader.lua + DESTINATION share/digwatch/lua) +install(FILES lua/output.lua + DESTINATION share/digwatch/lua) diff --git a/userspace/digwatch/config_digwatch.h.in b/userspace/digwatch/config_digwatch.h.in index 4b887cd3..9f75ffb1 100644 --- a/userspace/digwatch/config_digwatch.h.in +++ b/userspace/digwatch/config_digwatch.h.in @@ -2,6 +2,7 @@ #define DIGWATCH_VERSION "${DIGWATCH_VERSION}" -#define DIGWATCH_INSTALLATION_DIR "${CMAKE_INSTALL_PREFIX}" +#define DIGWATCH_LUA_DIR "/usr/share/digwatch/lua/" #define DIGWATCH_LUA_MAIN "${DIGWATCH_LUA_MAIN}" + diff --git a/userspace/digwatch/digwatch.cpp b/userspace/digwatch/digwatch.cpp index ab42ad92..b25e4748 100644 --- a/userspace/digwatch/digwatch.cpp +++ b/userspace/digwatch/digwatch.cpp @@ -169,7 +169,7 @@ int digwatch_init(int argc, char **argv) int long_index = 0; string lua_main_filename; string output_name = "stdout"; - string lua_dir = DIGWATCH_INSTALLATION_DIR; + string lua_dir = DIGWATCH_LUA_DIR; lua_State* ls = NULL; static struct option long_options[] =