From: Albin T. <alb...@gm...> - 2010-04-10 15:29:53
|
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 <lu...@de...> --- src/bin/Makefile.am | 3 ++- src/lib/Makefile.am | 2 +- src/lib/efreet_desktop.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index a516ebe..71886c1 100644 --- a/src/bin/Makefile.am +++ b/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/src/lib/Makefile.am b/src/lib/Makefile.am index f3d1c6c..eb4b7fc 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -31,7 +31,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/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c index f202f53..06c5779 100644 --- a/src/lib/efreet_desktop.c +++ b/src/lib/efreet_desktop.c @@ -289,7 +289,7 @@ efreet_desktop_init(void) efreet_desktop_listen_changes(); - ecore_exe_run(PACKAGE_BIN_DIR "/efreet_desktop_cache_create", NULL); + ecore_exe_run(PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", NULL); } @@ -2384,7 +2384,7 @@ efreet_desktop_update_cache_job(void *data __UNUSED__) if (efreet_desktop_exe_lock < 0) return; /* TODO: Retry update cache later */ 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; -- 1.7.0.4 |