From 16a9372e35a6132c4a7494948014d1cd6cca0c25 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 30 Dec 2012 11:42:04 +0000 Subject: [PATCH] efl/evas_cserve2: don't use libexec many distros deprecate libexec and it's better to keep our stuff together inside /usr/lib/evas. cserve2 binaries now lives in /usr/lib/evas/cserve2/bin SVN revision: 81897 --- src/Makefile_Evas.am | 5 +++-- src/bin/evas/evas_cserve2_slaves.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index a07fabbe70..37db7fb5d3 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -1432,7 +1432,8 @@ endif if EVAS_CSERVE2 -libexec_PROGRAMS = \ +evascserve2internal_bindir=$(libdir)/evas/cserve2/bin +evascserve2internal_bin_PROGRAMS = \ bin/evas/evas_cserve2 \ bin/evas/evas_cserve2_slave \ bin/evas/dummy_slave @@ -1465,7 +1466,7 @@ bin_evas_evas_cserve2_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/eet \ --DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c index 5cc6379bf7..63a11c0cfd 100644 --- a/src/bin/evas/evas_cserve2_slaves.c +++ b/src/bin/evas/evas_cserve2_slaves.c @@ -337,7 +337,7 @@ _slave_proc_path_get(const char *name) if (!access(buf, X_OK)) return eina_stringshare_add(buf); - snprintf(buf, sizeof(buf), PACKAGE_LIBEXEC_DIR"/%s", name); + snprintf(buf, sizeof(buf), PACKAGE_LIB_DIR"/evas/cserve2/bin/%s", name); if (!access(buf, X_OK)) return eina_stringshare_add(buf);