Install plugins in $(libdir)/babeltrace/plugins

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 9e36c48e4d2d441bb33a63eaf00da91789a1a345..847d19b754a10eee25b8a157ceaefde00922d0e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -231,6 +231,10 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
         [AC_MSG_ERROR([Cannot find popt.])]
 )
 
+# Plugins
+AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace/plugins]])
+AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace/plugins'])
+
 # For Python
 # SWIG version needed or newer:
 swig_version=2.0.0

diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am
index 46fe3ec4982161e2f33ca990cdac06524ee5ebda..f93e9de596a6a7d1ffa5d5f5b62552900a8feadf 100644 (file)
--- a/plugins/ctf/Makefile.am
+++ b/plugins/ctf/Makefile.am
@@ -2,7 +2,8 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 SUBDIRS = fs lttng-live
 
-lib_LTLIBRARIES = libbabeltrace-plugin-ctf.la
+plugindir = "$(PLUGINSDIR)"
+plugin_LTLIBRARIES = libbabeltrace-plugin-ctf.la
 
 # ctf plugin
 libbabeltrace_plugin_ctf_la_SOURCES = plugin.c
@@ -13,5 +14,5 @@ libbabeltrace_plugin_ctf_la_LDFLAGS = \
 libbabeltrace_plugin_ctf_la_LIBADD = \
        $(top_builddir)/lib/libbabeltrace.la \
        $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
-       $(top_builddir)/plugins/ctf/fs/libbabeltrace-plugin-ctf-fs.la \
-       $(top_builddir)/plugins/ctf/lttng-live/libbabeltrace-plugin-ctf-lttng-live.la
+       fs/libbabeltrace-plugin-ctf-fs.la \
+       lttng-live/libbabeltrace-plugin-ctf-lttng-live.la

diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am
index 1cfc8a0b1445011ce5388f50d37d6b3b9fa596e9..ccdf4cb7b808c6a5dfdd8f9fed8ffe03b40a6ce1 100644 (file)
--- a/plugins/text/Makefile.am
+++ b/plugins/text/Makefile.am
@@ -2,7 +2,8 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 SUBDIRS = .
 
-lib_LTLIBRARIES = libbabeltrace-plugin-ctf-text.la
+plugindir = "$(PLUGINSDIR)"
+plugin_LTLIBRARIES = libbabeltrace-plugin-ctf-text.la
 
 # ctf-text plugin
 libbabeltrace_plugin_ctf_text_la_SOURCES = \