elua: use eina_prefix

src/Makefile_Elua.am

@@ -7,11 +7,11 @@ bin_elua_elua_SOURCES = \
     bin/elua/main.c \
     bin/elua/io.c
 
-bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-    -DELUA_CORE_DIR="\"$(datadir)/elua/core\"" \
-    -DELUA_MODULES_DIR="\"$(datadir)/elua/modules\"" @ELUA_CFLAGS@ \
+bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
     -DLOCALE_DIR=\"@LOCALE_DIR@\" \
-    -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
+    -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+    -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+    -DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
 if HAVE_WIN32
 bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@
 else

src/bin/elua/main.c

@@ -17,10 +17,11 @@ enum
    ARG_LIBDIR
 };
 
-static Eina_List  *modlist     = NULL;
-static int         require_ref = LUA_REFNIL;
-static int         appload_ref = LUA_REFNIL;
-static const char *progname    = NULL;
+static Eina_List   *modlist     = NULL;
+static int          require_ref = LUA_REFNIL;
+static int          appload_ref = LUA_REFNIL;
+static const char  *progname    = NULL;
+static Eina_Prefix *prefix      = NULL;
 
 int el_log_domain = -1;
 
@@ -125,6 +126,7 @@ register_require(lua_State *L)
    Eina_List  *largs    = lua_touserdata(L, lua_upvalueindex(4)), *l = NULL;
    Eina_Bool   noenv    = lua_toboolean (L, lua_upvalueindex(5));
    Arg_Data   *data     = NULL;
+   char corepathbuf[PATH_MAX], modpathbuf[PATH_MAX], appspathbuf[PATH_MAX];
    int n = 2;
    lua_pushvalue(L, 1);
    require_ref = luaL_ref(L, LUA_REGISTRYINDEX);
@@ -141,17 +143,29 @@ register_require(lua_State *L)
         if (!corepath)
           {
              if (noenv || !(corepath = getenv("ELUA_CORE_DIR")) || !corepath[0])
-                corepath = ELUA_CORE_DIR;
+               {
+                  corepath = corepathbuf;
+                  snprintf(corepathbuf, sizeof(corepathbuf), "%s/core",
+                           eina_prefix_data_get(prefix));
+               }
           }
         if (!modpath)
           {
              if (noenv || !(modpath = getenv("ELUA_MODULES_DIR")) || !modpath[0])
-                modpath = ELUA_MODULES_DIR;
+               {
+                  modpath = modpathbuf;
+                  snprintf(modpathbuf, sizeof(modpathbuf), "%s/modules",
+                           eina_prefix_data_get(prefix));
+               }
           }
         if (!appspath)
           {
              if (noenv || !(appspath = getenv("ELUA_APPS_DIR")) || !appspath[0])
-                appspath = ELUA_APPS_DIR;
+               {
+                  appspath = appspathbuf;
+                  snprintf(appspathbuf, sizeof(appspathbuf), "%s/apps",
+                           eina_prefix_data_get(prefix));
+               }
           }
      }
    lua_pushfstring(L, "%s/?.lua;", corepath);
@@ -254,6 +268,8 @@ shutdown(lua_State *L, int c)
         lua_call(L, 0, 0);
      }
 
+   if (prefix) eina_prefix_free(prefix);
+
    if (L) lua_close(L);
    eina_shutdown();
    exit(c);
@@ -395,7 +411,8 @@ lua_main(lua_State *L)
    Arg_Data   *data    = NULL;
    const char *coref   = NULL;
    char       *coredir = NULL, *moddir = NULL, *appsdir = NULL;
-   char        modfile[1024];
+   char        modfile[PATH_MAX];
+   char       corefbuf[PATH_MAX];
 
    int ch;
 
@@ -448,6 +465,17 @@ lua_main(lua_State *L)
 
    luaL_openlibs(L);
 
+   prefix = eina_prefix_new(progname, lua_main, "ELUA", "elua", NULL,
+                            PACKAGE_BIN_DIR, "", PACKAGE_DATA_DIR,
+                            LOCALE_DIR);
+
+   if (!prefix)
+     {
+        ERR("could not find elua prefix");
+        m->status = 1;
+        return 0;
+     }
+
    if (getenv("EFL_RUN_IN_TREE"))
      {
         Arg_Data *v = malloc(sizeof(Arg_Data));
@@ -459,7 +487,11 @@ lua_main(lua_State *L)
    else if (!(coref = coredir))
      {
         if (noenv || !(coref = getenv("ELUA_CORE_DIR")) || !coref[0])
-           coref = ELUA_CORE_DIR;
+          {
+             coref = corefbuf;
+             snprintf(corefbuf, sizeof(corefbuf), "%s/core",
+                     eina_prefix_data_get(prefix));
+          }
      }
    snprintf(modfile, sizeof(modfile), "%s/module.lua", coref);
    if (report(L, elua_loadfile(L, modfile)))

src/bin/elua/main.h

@@ -12,18 +12,6 @@
 # define _(x) (x)
 #endif
 
-#ifndef ELUA_CORE_DIR
-# define ELUA_CORE_DIR "."
-#endif
-
-#ifndef ELUA_MODULES_DIR
-# define ELUA_MODULES_DIR "."
-#endif
-
-#ifndef ELUA_APPS_DIR
-# define ELUA_APPS_DIR "."
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>