From 87a8e51cd3457fc8a0cc89add65bc281e0f122db Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 10 Apr 2015 11:44:30 +0100 Subject: [PATCH] elua: remove elua_prefix from main runtime --- src/Makefile_Elua.am | 4 +--- src/bin/elua/main.c | 13 ------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index 8a5fc82..49ba426 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -31,9 +31,7 @@ bin_elua_elua_SOURCES = \ bin/elua/main.c bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \ - -DLOCALE_DIR=\"@LOCALE_DIR@\" \ - -DPACKAGE_BIN_DIR=\"$(bindir)\" \ - -DPACKAGE_DATA_DIR=\"$(datadir)/elua\" + -DLOCALE_DIR=\"@LOCALE_DIR@\" if HAVE_OSX if HAVE_X86_64 diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c index ed83b70..b2806be 100644 --- a/src/bin/elua/main.c +++ b/src/bin/elua/main.c @@ -37,7 +37,6 @@ enum static int elua_require_ref = LUA_REFNIL; static int elua_appload_ref = LUA_REFNIL; static const char *elua_progname = NULL; -static Eina_Prefix *elua_prefix = NULL; static Elua_State *elua_state = NULL; static int _el_log_domain = -1; @@ -224,7 +223,6 @@ void elua_bin_shutdown(Elua_State *es, int c) { INF("elua shutdown"); - if (elua_prefix) eina_prefix_free(elua_prefix); if (es) elua_state_free(es); if (_el_log_domain != EINA_LOG_DOMAIN_GLOBAL) eina_log_domain_unregister(_el_log_domain); @@ -337,17 +335,6 @@ elua_main(lua_State *L) lua_gc(L, LUA_GCSTOP, 0); - elua_prefix = eina_prefix_new(elua_progname, elua_main, "ELUA", "elua", "checkme", - PACKAGE_BIN_DIR, "", PACKAGE_DATA_DIR, - LOCALE_DIR); - - if (!elua_prefix) - { - ERR("could not find elua prefix"); - m->status = 1; - return 0; - } - elua_state_dirs_set(es, coredir, moddir, appsdir); elua_state_dirs_fill(es, noenv); -- 2.7.4