From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Wed, 24 Feb 2016 09:41:05 +0000 (-0500)
Subject: Install plugins in $(libdir)/babeltrace/plugins
X-Git-Tag: v2.0.0-pre1~829
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=a094f13b7b8048dcbe96286162e941cc007959da;hp=6a29d9fdf573e71039efd407da89e36f8c11ee42

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 9e36c48e..847d19b7 100644
--- 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 46fe3ec4..f93e9de5 100644
--- 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 1cfc8a0b..ccdf4cb7 100644
--- 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 = \