./configure && make && sudo make install


			
			
				devs/princeamd/enlightenment-0.17-elive
			
			
		
Carsten Haitzler 22 years ago
parent 35b056f1a3
commit cb64aa578f
  1. 10
      acconfig.h
  2. 1
      config.h.in
  3. 11
      configure.in
  4. 2
      src/actions.c
  5. 18
      src/border.c
  6. 4
      src/desktops.c
  7. 1
      src/e.h

@ -0,0 +1,10 @@
#undef ENABLE_NLS
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef HAVE_STPCPY
#undef HAVE_LIBSM
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_DATA_DIR
#undef PACKAGE_SOURCE_DIR
#undef PACKAGE_BIN_DIR

@ -52,6 +52,7 @@
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_DATA_DIR
#undef PACKAGE_SOURCE_DIR
#undef PACKAGE_BIN_DIR
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT

@ -33,6 +33,17 @@ else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
fi
dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/bin'; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin/${PACKAGE}")
else
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin/${PACKAGE}")
fi
else
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}/${PACKAGE}")
fi
dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")

@ -57,7 +57,7 @@ static void e_act_zoom_start (void *o, E_Action *a, void *data, int x, int y, in
static void
_e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o)
{
char *actions_db = "./actions.db";
char *actions_db = PACKAGE_DATA_DIR"/data/actions.db";
E_DB_File *db;
int i, num;
char *a_name = NULL;

@ -376,7 +376,7 @@ e_focus_out(Eevent * ev)
b = e_border_find_by_window(e->win);
if (b)
{
char *settings_db = PACKAGE_DATA_DIR"/settings.db";
char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
E_DB_File *db;
int focus_mode;
char buf[4096];
@ -956,9 +956,9 @@ e_border_apply_border(E_Border *b)
int pl, pr, pt, pb;
if ((!b->client.titlebar) &&
(!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/borderless.bits.db");
else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/border.bits.db");
else e_border_set_bits(b, PACKAGE_DATA_DIR"/border2.bits.db");
(!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/borderless.bits.db");
else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border.bits.db");
else e_border_set_bits(b, PACKAGE_DATA_DIR"/data/border2.bits.db");
pl = pr = pt = pb = 0;
if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb);
@ -1034,7 +1034,7 @@ e_border_new(void)
int max_colors = 216;
int font_cache = 1024 * 1024;
int image_cache = 8192 * 1024;
char *font_dir = PACKAGE_DATA_DIR"/fnt";
char *font_dir = PACKAGE_DATA_DIR"/data/fnt";
E_Desktop *desk;
b = NEW(E_Border, 1);
@ -1190,8 +1190,8 @@ e_border_remove_mouse_grabs(E_Border *b)
void
e_border_attach_mouse_grabs(E_Border *b)
{
char *grabs_db = PACKAGE_DATA_DIR"/grabs.db";
char *settings_db = PACKAGE_DATA_DIR"/settings.db";
char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db";
char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
E_DB_File *db;
int focus_mode;
char buf[4096];
@ -1283,8 +1283,8 @@ e_border_attach_all_mouse_grabs(void)
void
e_border_redo_grabs(void)
{
char *grabs_db = PACKAGE_DATA_DIR"/grabs.db";
char *settings_db = PACKAGE_DATA_DIR"/settings.db";
char *grabs_db = PACKAGE_DATA_DIR"/data/grabs.db";
char *settings_db = PACKAGE_DATA_DIR"/data/settings.db";
static time_t mod_date_grabs = 0;
static time_t mod_date_settings = 0;
time_t mod;

@ -379,11 +379,11 @@ e_desktops_init_file_display(E_Desktop *desk)
Evas e;
e = desk->evas.desk;
o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/bg.png");
o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/bg.png");
evas_move(e, o, 0, 0);
evas_resize(e, o, screen_w, screen_h);
evas_show(e, o);
o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/e_logo.png");
o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/data/e_logo.png");
evas_move(e, o, 0, 0);
evas_show(e, o);
}

@ -1,3 +1,4 @@
#include "../config.h"
#include <X11/Xlib.h>
#include <Imlib2.h>
#include <Evas.h>

Loading…
Cancel
Save