Rename binary installation path define

INSTALL_PATH --> INSTALL_BIN_PATH

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 9134a3e95cd7cf85bd2fad0c6018dc45d6f1cf31..17dc58747735cc0bbadb1e8538cc243f44671e61 100644 (file)
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm \
 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
 
 
 AM_CFLAGS = -fno-strict-aliasing
 

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 63e99df386610b79f79e4f618020c9e67964137b..a78cc7e02f04c5572680deae8acfbe93c774d41e 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -914,7 +914,7 @@ static pid_t spawn_kconsumerd(void)
                /*
                 * Exec kconsumerd.
                 */
                /*
                 * 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");
                }
                if (errno != 0) {
                        perror("kernel start consumer exec");
                }

diff --git a/lttng/Makefile.am b/lttng/Makefile.am
index 2efd94e1dba914824be589a1aa2ac4b99a1325f7..9d696aa01f360232f2b67ba985c4590618d78871 100644 (file)
--- 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
 
 
 bin_PROGRAMS = lttng
 

diff --git a/lttng/lttng.c b/lttng/lttng.c
index f568933650407693be890e636843effa77af0299..3e5f1b187f238049bc8c81a01fafbd161083888f 100644 (file)
--- 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) {
 
                /* 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;
                        if (ret < 0) {
                                perror("asprintf spawn sessiond");
                                goto end;