[beast: 21/39] PLUGINS: install plugins under $(pkglibdir)/plugins

[Tim Janik <timj src gnome org>]

commit 5e2061748b26d11cab52fe183d544e5275d17f8d
Author: Tim Janik <timj gnu org>
Date:   Sat Sep 12 00:39:17 2015 +0200

    PLUGINS: install plugins under $(pkglibdir)/plugins

 configure.ac                  |    2 --
 plugins/Makefile.am           |    4 ++--
 plugins/evaluator/Makefile.am |    2 +-
 plugins/freeverb/Makefile.am  |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4458a17..3ef613e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,8 +442,6 @@ AC_DEFUN([AC_BSE_REQUIREMENTS],
       AC_DEFINE(HAVE_SINCOS, 1, [Define if you have the sincos function in <math.h>]))
 
     # --- setup BSE search/install paths ---
-    bseplugindir=\${libdir}/bse/v$BIN_VERSION/plugins
-    AC_SUBST(bseplugindir)
     bsedriverdir=\${libdir}/bse/v$BIN_VERSION/drivers
     AC_SUBST(bsedriverdir)
     bseladspapath=${libdir}/ladspa
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e0743f5..f126c73 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -62,13 +62,13 @@ CLEANFILES           += $(plugins_built_sources)
 # .FPU plugins
 plugin_FPU_ltlibs        =     # listed in Makefile.plugins
 plugin_FPU_LTLIBRARIES   = $(plugin_FPU_ltlibs) cxxplugins.FPU.la
-plugin_FPUdir            = $(bseplugindir)
+plugin_FPUdir            = $(pkglibdir)/plugins
 FPU_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 FPU_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 # .SSE plugins
 plugin_SSE_ltlibs        =     # listed in Makefile.plugins
 plugin_SSE_LTLIBRARIES   = $(plugin_SSE_cond_libs) cxxplugins.SSE.la
-plugin_SSEdir            = $(bseplugindir)
+plugin_SSEdir            = $(pkglibdir)/plugins
 SSE_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
 SSE_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
 if WITH_MMX_SSE
diff --git a/plugins/evaluator/Makefile.am b/plugins/evaluator/Makefile.am
index b40e523..a60ac54 100644
--- a/plugins/evaluator/Makefile.am
+++ b/plugins/evaluator/Makefile.am
@@ -15,7 +15,7 @@ include $(top_srcdir)/Makefile.decl
 #AM_CPPFLAGS += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\""
 #
 ## install plugins under:
-#plugindir = $(bseplugindir)
+#plugindir = $(pkglibdir)/plugins
 #
 ## setup generation of C++ plugins from idl files
 #SFIDL = ../../sfi/sfidl
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 6b15bd8..b9e39f7 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -6,7 +6,7 @@ DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # install plugins under:
-plugindir = $(bseplugindir)
+plugindir = $(pkglibdir)/plugins
 
 freeverb_la_SOURCES = allpass.cpp comb.cpp revmodel.cpp bsefreeverbcpp.cpp bsefreeverb.cc
 freeverb_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version