From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 20 Jul 2011 21:18:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre2~12
X-Git-Url: https://git.liburcu.org/?a=commitdiff_plain;h=059008c7017e1148c77e4ec7050227f80300c5bd;hp=bb61c89440b5ed49c3b4a7ea0064eb5e4cac486a;p=lttng-tools.git

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 9134a3e95..17dc58747 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm \
-			  -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl
-
-INCLUDES = -DINSTALL_PATH=\""$(bindir)"\"
+			  -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl \
+			  -DINSTALL_BIN_PATH=\"$(bindir)\"
 
 AM_CFLAGS = -fno-strict-aliasing
 
diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 63e99df38..a78cc7e02 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -914,7 +914,7 @@ static pid_t spawn_kconsumerd(void)
 		/*
 		 * Exec kconsumerd.
 		 */
-		execl(INSTALL_PATH "/ltt-kconsumerd", "ltt-kconsumerd", "--quiet", NULL);
+		execl(INSTALL_BIN_PATH "/ltt-kconsumerd", "ltt-kconsumerd", "--quiet", NULL);
 		if (errno != 0) {
 			perror("kernel start consumer exec");
 		}
diff --git a/lttng/Makefile.am b/lttng/Makefile.am
index 2efd94e1d..9d696aa01 100644
--- a/lttng/Makefile.am
+++ b/lttng/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-INCLUDES = -DINSTALL_PATH=\""$(bindir)"\"
+AM_CPPFLAGS = -I$(top_srcdir)/include -DINSTALL_BIN_PATH=\""$(bindir)"\"
 
 bin_PROGRAMS = lttng
 
diff --git a/lttng/lttng.c b/lttng/lttng.c
index f56893365..3e5f1b187 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -336,7 +336,7 @@ static int check_sessiond(void)
 
 		/* Let's rock and roll */
 		if (pathname == NULL) {
-			ret = asprintf(&alloc_pathname, INSTALL_PATH "/ltt-sessiond");
+			ret = asprintf(&alloc_pathname, INSTALL_BIN_PATH "/ltt-sessiond");
 			if (ret < 0) {
 				perror("asprintf spawn sessiond");
 				goto end;