elua: move core scripts to src/scripts

This commit is contained in:
Daniel Kolesa 2014-12-11 16:59:27 +00:00
parent aa6f9ea4a9
commit c65221c0ae
13 changed files with 15 additions and 15 deletions

View File

@ -56,17 +56,17 @@ include Makefile_Elua_Helper.am
eluaappsdir = $(datadir)/elua/apps
eluaapps_DATA = \
bin/elua/apps/lualian.lua \
bin/elua/apps/xgettext.lua
scripts/elua/apps/lualian.lua \
scripts/elua/apps/xgettext.lua
EXTRA_DIST += $(eluaapps_DATA)
eluamodulesdir = $(datadir)/elua/modules
eluamodules_DATA = \
bin/elua/modules/benchmark.lua \
bin/elua/modules/getopt.lua \
bin/elua/modules/lualian.lua \
scripts/elua/modules/benchmark.lua \
scripts/elua/modules/getopt.lua \
scripts/elua/modules/lualian.lua \
bindings/luajit/eo.lua \
bindings/luajit/eolian.lua
@ -75,9 +75,9 @@ EXTRA_DIST += $(eluamodules_DATA)
eluaxgettextdir = $(eluamodulesdir)/xgettext
eluaxgettext_DATA = \
bin/elua/modules/xgettext/lexer.lua \
bin/elua/modules/xgettext/parser.lua \
bin/elua/modules/xgettext/generator.lua
scripts/elua/modules/xgettext/lexer.lua \
scripts/elua/modules/xgettext/parser.lua \
scripts/elua/modules/xgettext/generator.lua
EXTRA_DIST += $(eluaxgettext_DATA)
@ -100,9 +100,9 @@ EXTRA_DIST += $(eluaeina_DATA)
eluacoredir = $(datadir)/elua/core
eluacore_DATA = \
bin/elua/core/gettext.lua \
bin/elua/core/module.lua \
bin/elua/core/util.lua
scripts/elua/core/gettext.lua \
scripts/elua/core/module.lua \
scripts/elua/core/util.lua
EXTRA_DIST += $(eluacore_DATA)

View File

@ -133,9 +133,9 @@ elua_register_require(lua_State *L)
elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX);
if (getenv("EFL_RUN_IN_TREE"))
{
corepath = PACKAGE_SRC_DIR "/src/bin/elua/core";
modpath = PACKAGE_SRC_DIR "/src/bin/elua/modules";
appspath = PACKAGE_SRC_DIR "/src/bin/elua/apps";
corepath = PACKAGE_SRC_DIR "/src/scripts/elua/core";
modpath = PACKAGE_SRC_DIR "/src/scripts/elua/modules";
appspath = PACKAGE_SRC_DIR "/src/scripts/elua/apps";
}
else
{
@ -474,7 +474,7 @@ elua_main(lua_State *L)
v->type = ARG_LIBDIR;
v->value = PACKAGE_SRC_DIR "/src/bindings/luajit";
largs = eina_list_append(largs, v);
coref = PACKAGE_SRC_DIR "/src/bin/elua/core";
coref = PACKAGE_SRC_DIR "/src/scripts/elua/core";
}
else if (!(coref = coredir))
{