raster pushed a commit to branch master.
commit 688276f3259eee7da29a3b7e046b0ab2c33365fd
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Wed Sep 4 12:00:08 2013 +0900
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);
}
--
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
