From 056632bfab2b876e4e6149eaa3a6889ca3d28533 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 9 Jul 2019 18:01:40 -0400 Subject: [PATCH] Rename PLUGINSDIR to BABELTRACE_PLUGINS_DIR and enable it The configure script uses the PLUGINSDIR variable to set the installation directory of the plugins on the system. However this variable is not used when setting this value in the library, the default value happens to match. Fix the build system to honor this variable and rename it to BABELTRACE_PLUGINS_DIR. Change-Id: I8575d455017f2964e67fdfab609f5c609434d37b Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/1681 Tested-by: jenkins Reviewed-by: Philippe Proulx --- configure.ac | 9 +++++---- src/common/Makefile.am | 2 +- src/common/common.c | 2 +- src/plugins/ctf/Makefile.am | 2 +- src/plugins/lttng-utils/Makefile.am | 2 +- src/plugins/text/Makefile.am | 2 +- src/plugins/utils/Makefile.am | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 5d224371..f745ef23 100644 --- a/configure.ac +++ b/configure.ac @@ -336,9 +336,9 @@ AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config] AC_ARG_VAR([PYTHON_LDFLAGS], [Linker flags for Python, bypassing python-config]) AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) -# PLUGINSDIR: Plugins directory -AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]]) -AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins']) +# BABELTRACE_PLUGINS_DIR: Plugins directory +AC_ARG_VAR([BABELTRACE_PLUGINS_DIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]]) +AS_IF([test "x$BABELTRACE_PLUGINS_DIR" = x], [BABELTRACE_PLUGINS_DIR='${libdir}/babeltrace2/plugins']) # BABELTRACE_MINIMAL_LOG_LEVEL: AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)]) @@ -839,11 +839,12 @@ PPRINT_PROP_BOOL([Developer mode], $BABELTRACE_DEV_MODE) report_bindir="`eval eval echo $bindir`" report_libdir="`eval eval echo $libdir`" report_sysconfdif="`eval eval echo $sysconfdir`" +report_pluginsdir="`eval eval eval echo $BABELTRACE_PLUGINS_DIR`" # Print the bindir and libdir this `make install' will install into. AS_ECHO PPRINT_SUBTITLE([Install directories]) PPRINT_PROP_STRING([Binaries], [$report_bindir]) PPRINT_PROP_STRING([Libraries], [$report_libdir]) -PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins]) +PPRINT_PROP_STRING([Plugins], [$report_pluginsdir]) PPRINT_PROP_STRING([Configuration], [$report_sysconfdif]) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 02b8106a..16508165 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\" +AM_CPPFLAGS += -DBABELTRACE_PLUGINS_DIR=\"$(BABELTRACE_PLUGINS_DIR)\" noinst_LTLIBRARIES = libbabeltrace2-common.la diff --git a/src/common/common.c b/src/common/common.c index ed1d1c27..beedec66 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -49,7 +49,7 @@ #include #endif -#define SYSTEM_PLUGIN_PATH INSTALL_LIBDIR "/babeltrace2/plugins" +#define SYSTEM_PLUGIN_PATH BABELTRACE_PLUGINS_DIR #define HOME_ENV_VAR "HOME" #define HOME_PLUGIN_SUBPATH "/.local/lib/babeltrace2/plugins" diff --git a/src/plugins/ctf/Makefile.am b/src/plugins/ctf/Makefile.am index 4b19f56d..d98bd250 100644 --- a/src/plugins/ctf/Makefile.am +++ b/src/plugins/ctf/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = common \ fs-sink \ lttng-live -plugindir = "$(PLUGINSDIR)" +plugindir = "$(BABELTRACE_PLUGINS_DIR)" plugin_LTLIBRARIES = babeltrace-plugin-ctf.la # ctf plugin diff --git a/src/plugins/lttng-utils/Makefile.am b/src/plugins/lttng-utils/Makefile.am index d7d980ae..b4322c48 100644 --- a/src/plugins/lttng-utils/Makefile.am +++ b/src/plugins/lttng-utils/Makefile.am @@ -8,7 +8,7 @@ babeltrace_plugin_lttng_utils_la_LIBADD += \ debug-info/libdebug-info.la endif -plugindir = "$(PLUGINSDIR)" +plugindir = "$(BABELTRACE_PLUGINS_DIR)" plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la babeltrace_plugin_lttng_utils_la_SOURCES = \ diff --git a/src/plugins/text/Makefile.am b/src/plugins/text/Makefile.am index 27560ad4..bd74b008 100644 --- a/src/plugins/text/Makefile.am +++ b/src/plugins/text/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = pretty dmesg details -plugindir = "$(PLUGINSDIR)" +plugindir = "$(BABELTRACE_PLUGINS_DIR)" plugin_LTLIBRARIES = babeltrace-plugin-text.la babeltrace_plugin_text_la_SOURCES = plugin.c diff --git a/src/plugins/utils/Makefile.am b/src/plugins/utils/Makefile.am index 67f34f22..6f91de9f 100644 --- a/src/plugins/utils/Makefile.am +++ b/src/plugins/utils/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = dummy muxer counter trimmer -plugindir = "$(PLUGINSDIR)" +plugindir = "$(BABELTRACE_PLUGINS_DIR)" plugin_LTLIBRARIES = babeltrace-plugin-utils.la babeltrace_plugin_utils_la_SOURCES = plugin.c -- 2.34.1