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 /plugin/fulltext | |
| 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 'plugin/fulltext')
| -rw-r--r-- | plugin/fulltext/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index ec033018a00..2b9d075bae0 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -15,12 +15,12 @@ #Makefile.am example for a plugin -pkglibdir=$(libdir)/mysql +pkgplugindir=$(libdir)/@PACKAGE@/plugin INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include #noinst_LTLIBRARIES= mypluglib.la -pkglib_LTLIBRARIES= mypluglib.la +pkgplugin_LTLIBRARIES= mypluglib.la mypluglib_la_SOURCES= plugin_example.c -mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir) +mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN # Don't update the files from bitkeeper |