diff options
| author | jperkin/jonathan@chorlton.adsl.perkin.org.uk <> | 2007-12-19 13:24:43 +0000 |
|---|---|---|
| committer | jperkin/jonathan@chorlton.adsl.perkin.org.uk <> | 2007-12-19 13:24:43 +0000 |
| commit | f988a7e600b2eb997d0211ee0c9e7cb436fd260a (patch) | |
| tree | 7e366b1d392d7928acf0727223f607ab5edd44d4 /storage/blackhole | |
| parent | e591fc7cb829b392948cdc35074f43c52c848f8a (diff) | |
| download | mariadb-git-f988a7e600b2eb997d0211ee0c9e7cb436fd260a.tar.gz | |
Add new pkgplugindir handling to seperate plugins from libraries,
and allow override for binary distributions. Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use. Resolves bug#31736.
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am index 9dd533dd4fa..9810dff5866 100644 --- a/storage/blackhole/Makefile.am +++ b/storage/blackhole/Makefile.am @@ -19,6 +19,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) +pkgplugindir = $(libdir)/@PACKAGE@/plugin INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ @@ -32,8 +33,8 @@ DEFS = @DEFS@ noinst_HEADERS = ha_blackhole.h EXTRA_LTLIBRARIES = ha_blackhole.la -pkglib_LTLIBRARIES = @plugin_blackhole_shared_target@ -ha_blackhole_la_LDFLAGS=-module -rpath $(MYSQLLIBdir) +pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ +ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_SOURCES=ha_blackhole.cc |