From 0d126eab35e7cae8137ec5f62425258a56d5eb53 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 19 Jul 2016 16:19:42 +0100 Subject: [PATCH] elua: enable module lookups in apps location This will allow for better organization of the docgen script. --- src/lib/elua/elua.c | 3 ++- src/scripts/elua/core/module.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c index 606d04e45b..f537663d53 100644 --- a/src/lib/elua/elua.c +++ b/src/lib/elua/elua.c @@ -499,7 +499,7 @@ _elua_module_system_init(lua_State *L) const char *modpath = es->moddir; const char *appspath = es->appsdir; Eina_Stringshare *data = NULL; - int n = 3; + int n = 4; if (!corepath || !modpath || !appspath) return 0; lua_pushvalue(L, 1); @@ -515,6 +515,7 @@ _elua_module_system_init(lua_State *L) } lua_pushfstring(L, "%s/?.eo.lua;", modpath); lua_pushfstring(L, "%s/?.lua;", modpath); + lua_pushfstring(L, "%s/?.lua;", appspath); lua_pushvalue(L, 3); lua_concat(L, n + 1); lua_pushfstring(L, "%s/?.lua;", appspath); diff --git a/src/scripts/elua/core/module.lua b/src/scripts/elua/core/module.lua index 041548084d..fdaca55c91 100644 --- a/src/scripts/elua/core/module.lua +++ b/src/scripts/elua/core/module.lua @@ -17,7 +17,7 @@ M.preload = preload for k, v in pairs(package.loaded) do loaded[k] = v end -M.path = "./?.lua;/?/init.lua" +M.path = "./?.lua;./?/init.lua" M.cpath = "" M.apath = "./?.lua"