Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_prefix.c e_test.c
Log Message:
fix bin/lib prefix - pass as -D
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- Makefile.am 9 Jul 2006 18:35:56 -0000 1.126
+++ Makefile.am 13 Jul 2006 16:35:45 -0000 1.127
@@ -6,7 +6,11 @@
@x_cflags@ \
@cf_cflags@ \
@VALGRIND_CFLAGS@ \
- @EDJE_DEF@
+ @EDJE_DEF@ \
+ -DPACKAGE_BIN_DIR=\"@[EMAIL PROTECTED]" \
+ -DPACKAGE_LIB_DIR=\"@[EMAIL PROTECTED]" \
+ -DPACKAGE_DATA_DIR=\"@[EMAIL PROTECTED]" \
+ -DLOCALE_DIR=\"@[EMAIL PROTECTED]"
bin_PROGRAMS = \
enlightenment \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_prefix.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_prefix.c 10 Jul 2006 19:33:00 -0000 1.15
+++ e_prefix.c 13 Jul 2006 16:35:46 -0000 1.16
@@ -71,7 +71,7 @@
{
if (!_e_prefix_try_argv(argv0))
{
- _e_prefix_fallbacks();
+ e_prefix_fallback();
return 0;
}
}
@@ -349,7 +349,7 @@
_prefix_path_lib = strdup(PACKAGE_LIB_DIR);
printf("WARNING: Enlightenment could not determine its installed prefix\n"
" and is falling back on the compiled in default:\n"
- " %s\n",
+ " %s\n"
" You might like to try setting the following environment
variables:\n"
" E_PREFIX - points to the base prefix of install\n"
" E_BIN_DIR - optional in addition to E_PREFIX to
provide\n"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_test.c 27 Mar 2006 14:46:26 -0000 1.47
+++ e_test.c 13 Jul 2006 16:35:46 -0000 1.48
@@ -584,6 +584,29 @@
evas_object_focus_set(o, 1);
}
+#elif 0
+static void
+_e_test_internal(E_Container *con)
+{
+ E_Dialog *dia;
+ Evas_Object *o;
+ Evas_Coord mw, mh;
+
+ dia = e_dialog_new(con);
+ e_dialog_title_set(dia, "A Test Dialog");
+
+ o = e_fm2_add(dia->win->evas);
+ e_fm2_path_set(o, "~/", "/");
+ evas_object_show(o);
+
+ e_dialog_content_set(dia, o, 480, 320);
+
+ e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+
+ evas_object_focus_set(o, 1);
+}
#else
static void
_e_test_internal(E_Container *con)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
