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 <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1681
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/configure.ac b/configure.ac
index 5d224371a7f71c9769d47cbe8fdd77ed14a69e4c..f745ef2341d9e10669eaf06227151b962d6fd450 100644 (file)
--- 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 02b8106a0f7b604b56074c3f06dfc6b07dcabee1..16508165d77e42b2329606ca34b751c0a417b246 100644 (file)
--- 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 ed1d1c277f687d614d3795698e5e29044888d8b6..beedec66919b917b5696168cd39dc7632f12472b 100644 (file)
--- a/src/common/common.c
+++ b/src/common/common.c
@@ -49,7 +49,7 @@
 #include <sys/ioctl.h>
 #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 4b19f56dd268c82fa44e20f5b54269b6db729608..d98bd2500ffa5d20c2d221a23036fd63c069d47b 100644 (file)
--- 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 d7d980aef720b22b055e8fc7f95f6da78e7756f8..b4322c480b2761568144c8cd5965b850fc234afe 100644 (file)
--- 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 27560ad4528c08e67ac03306f7b474a7d8cb881b..bd74b0083c671934ee4a5fbb4e10ecb698d8028f 100644 (file)
--- 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 67f34f22f42657dffa4d25076101f7a74ca768ee..6f91de9f0f6ae4a8a6762c30bae242e07042c269 100644 (file)
--- 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