From 1dde324c33b4d574b0b5bfc6d2fae041a4d937d2 Mon Sep 17 00:00:00 2001 From: Albin Tonnerre Date: Sat, 17 Apr 2010 20:19:35 +0000 Subject: [PATCH] [E-devel] [PATCH] Efreet: move efreet_desktop_cache_create out of the path This binary is just an internal helper, and isn't expected to be run by anything but efreet. Therefore, let's emphasize this and keep it out of the path by installing it in PACKAGE_LIB_DIR/efreet/ Signed-off-by: Albin Tonnerre By: Albin Tonnerre SVN revision: 48085 --- legacy/efreet/src/bin/Makefile.am | 3 ++- legacy/efreet/src/lib/Makefile.am | 2 +- legacy/efreet/src/lib/efreet_desktop.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/legacy/efreet/src/bin/Makefile.am b/legacy/efreet/src/bin/Makefile.am index a516ebe55e..71886c112d 100644 --- a/legacy/efreet/src/bin/Makefile.am +++ b/legacy/efreet/src/bin/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EFREET_CFLAGS@ -bin_PROGRAMS = \ +internal_bindir=$(libdir)/efreet +internal_bin_PROGRAMS = \ efreet_desktop_cache_create efreet_desktop_cache_create_LDADD = \ diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am index f8c461a357..4f2c84b899 100644 --- a/legacy/efreet/src/lib/Makefile.am +++ b/legacy/efreet/src/lib/Makefile.am @@ -32,7 +32,7 @@ dist_installed_headers_DATA = $(EFREETHEADERS) Efreet_Mime.h Efreet_Trash.h libefreet_la_SOURCES = $(EFREETSOURCES) libefreet_la_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -I$(top_builddir)/src/lib \ -I$(top_srcdir)/src/lib \ @EFL_EFREET_BUILD@ \ diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c index 54b6e3cdbb..ba0c591b33 100644 --- a/legacy/efreet/src/lib/efreet_desktop.c +++ b/legacy/efreet/src/lib/efreet_desktop.c @@ -198,7 +198,7 @@ efreet_desktop_init(void) efreet_desktop_changes_listen(); - ecore_exe_run(PACKAGE_BIN_DIR "/efreet_desktop_cache_create", NULL); + ecore_exe_run(PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", NULL); } @@ -1476,7 +1476,7 @@ efreet_desktop_update_cache_job(void *data __UNUSED__) efreet_desktop_exe_lock = open(file, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR); if (efreet_desktop_exe_lock < 0) return; if (flock(efreet_desktop_exe_lock, LOCK_EX | LOCK_NB) < 0) goto error; - efreet_desktop_exe = ecore_exe_run(PACKAGE_BIN_DIR "/efreet_desktop_cache_create", NULL); + efreet_desktop_exe = ecore_exe_run(PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", NULL); if (!efreet_desktop_exe) goto error; return;