From 4bc68f60709a611be1f5caaaaec8c90f9dd4d0e9 Mon Sep 17 00:00:00 2001 From: Gianni Borghesan Date: Tue, 13 Dec 2016 12:12:19 +0100 Subject: [PATCH] fix env hooks for catkin --- README | 1 + env-hooks/10.rttlua_completion.sh.develspace.in | 3 ++- env-hooks/10.rttlua_completion.sh.installspace.in | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README b/README index c3cec52..a67f718 100644 --- a/README +++ b/README @@ -25,6 +25,7 @@ Note that in virtually all cases, you want your LUA_PATH and LUA_CPATH variables to start with ';;;', which means: search standard system paths as well. +_NOTE_ the env hooks will setup the paths automatically. RUNNING ------- diff --git a/env-hooks/10.rttlua_completion.sh.develspace.in b/env-hooks/10.rttlua_completion.sh.develspace.in index 0af8d5c..8bad7d8 100644 --- a/env-hooks/10.rttlua_completion.sh.develspace.in +++ b/env-hooks/10.rttlua_completion.sh.develspace.in @@ -7,4 +7,5 @@ export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua" if [ "x$LUA_CPATH" = "x" ]; then LUA_CPATH=";" fi -export LUA_CPATH="$LUA_CPATH;@CMAKE_CURRENT_SOURCE_DIR@/?.so" +export LUA_CPATH="$LUA_CPATH;@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/?.so" + diff --git a/env-hooks/10.rttlua_completion.sh.installspace.in b/env-hooks/10.rttlua_completion.sh.installspace.in index e6509a8..6cd8555 100644 --- a/env-hooks/10.rttlua_completion.sh.installspace.in +++ b/env-hooks/10.rttlua_completion.sh.installspace.in @@ -7,4 +7,5 @@ export LUA_PATH="$LUA_PATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completio if [ "x$LUA_CPATH" = "x" ]; then LUA_CPATH=";" fi -export LUA_CPATH="$LUA_CPATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rttlua_completion/?.so" +export LUA_CPATH="$LUA_CPATH;@CMAKE_INSTALL_PREFIX@/lib/?.so" +