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 /libmysqld/Makefile.am | |
| 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 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index c0784447216..117f8752629 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -21,13 +21,14 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(libdir) +pkgplugindir = $(libdir)/@PACKAGE@/plugin EXTRA_DIST = libmysqld.def CMakeLists.txt DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ - -DLIBDIR="\"$(MYSQLLIBdir)\"" + -DPLUGINDIR="\"$(pkgplugindir)\"" INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/sql -I$(top_srcdir)/sql \ -I$(top_srcdir)/sql/examples \ |