Enlightenment CVS committal

Author  : englebass
Project : e_modules
Module  : emu

Dir     : e_modules/emu/src/modules/emu


Modified Files:
        Makefile.am e_mod_main.c 


Log Message:
Install complete module in module dir.

===================================================================
RCS file: /cvs/e/e_modules/emu/src/modules/emu/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 7 Nov 2007 19:35:38 -0000       1.9
+++ Makefile.am 15 Nov 2007 18:54:02 -0000      1.10
@@ -8,7 +8,7 @@
 -fd $(top_srcdir)/data/fonts
 
 # data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+filesdir = $(datadir)
 files_DATA = e-module-emu.edj module.desktop
 
 EXTRA_DIST = $(files_DATA) \
@@ -23,7 +23,7 @@
                          -I$(top_srcdir)/src/lib \
                          -I$(top_srcdir)/src/modules \
                          @e_cflags@
-pkgdir                 = 
$(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkgdir                 = $(datadir)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
===================================================================
RCS file: /cvs/e/e_modules/emu/src/modules/emu/e_mod_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_main.c        12 Nov 2007 06:28:31 -0000      1.24
+++ e_mod_main.c        15 Nov 2007 18:54:02 -0000      1.25
@@ -183,10 +183,11 @@
    if (emu_face)
      {
         Evas_Object *o;
+        char buf[4096];
 
         o = edje_object_add(gc->evas);
         if ((!e_theme_edje_object_set(o, "base/theme/modules/emu", 
"modules/emu/main")) /*&& (_emu_module_edje)*/)
-           edje_object_file_set(o, (char *)_emu_module_edje, 
"modules/emu/main");
+           edje_object_file_set(o, _emu_module_edje, "modules/emu/main");
         edje_object_signal_emit(o, "passive", "");
 
         gcc = e_gadcon_client_new(gc, name, id, style, o);
@@ -196,7 +197,8 @@
         emu_face->menus = NULL;
 
         emu_face->name = evas_stringshare_add("Emu tester");
-        emu_face->command = evas_stringshare_add("emu_client");
+        snprintf(buf, sizeof(buf), "%s/bin/emu_client", 
e_module_dir_get(emu_module));
+        emu_face->command = evas_stringshare_add(buf);
         if (emu_face->command)
           {
              emu_face->del = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 
_emu_cb_exe_del, emu_face);



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to