From 386418ba16ccc166a02e548d832d2d6945525c0d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 15 Mar 2012 14:30:43 -0400 Subject: [PATCH] Fix: install lttng-consumerd in lib/lttng/libexec/ This program is not meant to be executed by end-users: it is spawned only by the session daemon. Closes #46 Signed-off-by: Mathieu Desnoyers --- configure.ac | 7 +++++-- src/bin/lttng-consumerd/Makefile.am | 2 +- src/bin/lttng-sessiond/Makefile.am | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3156273df..6d60bd5c1 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,9 @@ lttngincludedir="${includedir}/lttng" AC_SUBST(lttngincludedir) AC_SUBST(DEFAULT_INCLUDES) +lttnglibexecdir="${libdir}/lttng/libexec" +AC_SUBST(lttnglibexecdir) + AC_CONFIG_FILES([ Makefile doc/Makefile @@ -238,7 +241,7 @@ AS_IF([test "x$consumerd_only" = "xno"],[ AS_ECHO("The sessiond daemon will look in the following directories: ") AS_ECHO_N("32-bit consumerd executable at: ") AS_IF([test "$CONSUMERD32_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $bindir`") + AS_ECHO_N("`eval eval echo $lttnglibexecdir`") AS_ECHO("/lttng-consumerd") ],[ AS_ECHO("$CONSUMERD32_BIN") @@ -253,7 +256,7 @@ AS_IF([test "x$consumerd_only" = "xno"],[ AS_ECHO_N("64-bit consumerd executable at: ") AS_IF([test "$CONSUMERD64_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $bindir`") + AS_ECHO_N("`eval eval echo $lttnglibexecdir`") AS_ECHO("/lttng-consumerd") ],[ AS_ECHO("$CONSUMERD64_BIN") diff --git a/src/bin/lttng-consumerd/Makefile.am b/src/bin/lttng-consumerd/Makefile.am index 470c8c17a..acd58cdc3 100644 --- a/src/bin/lttng-consumerd/Makefile.am +++ b/src/bin/lttng-consumerd/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -bin_PROGRAMS = lttng-consumerd +lttnglibexec_PROGRAMS = lttng-consumerd lttng_consumerd_SOURCES = lttng-consumerd.c lttng-consumerd.h diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index 44948fc14..ccdbe3afc 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(bindir)"\" \ +AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \ -DINSTALL_LIB_PATH=\""$(libdir)"\" AM_CFLAGS = -fno-strict-aliasing -- 2.34.1