From 688276f3259eee7da29a3b7e046b0ab2c33365fd Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 4 Sep 2013 12:00:08 +0900 Subject: [PATCH] fix func prototype to be void and use proper compile defined dirs paths --- src/daemon/Makefile.am | 1 + src/daemon/entrance.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 91ace25..17d8a27 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ -DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \ +-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \ @ENTRANCE_CFLAGS@ if HAVE_CONSOLEKIT diff --git a/src/daemon/entrance.c b/src/daemon/entrance.c index 52cd74c..6f5f94d 100644 --- a/src/daemon/entrance.c +++ b/src/daemon/entrance.c @@ -135,9 +135,10 @@ entrance_close_log() } static void -_entrance_wait() +_entrance_wait(void) { - execl(PACKAGE_BIN_DIR"/entrance_wait", "/usr/sbin/entrance", NULL); + // XXX: use eina_prefix! hardcoding paths . :( + execl(PACKAGE_BIN_DIR"/entrance_wait", PACKAGE_SBIN_DIR"/entrance", NULL); PT("HUM HUM HUM can't wait ...\n\n\n"); _exit(1); }