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 /scripts/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 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fc4359fd872..8669e075959 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -90,6 +90,8 @@ CLEANFILES = @server_scripts@ \ mysql_tableinfo \ mysqld_multi +pkgplugindir = $(libdir)/@PACKAGE@/plugin + # Default same as 'pkgdatadir', but we can override it pkgsuppdir = $(datadir)/@PACKAGE@ @@ -137,6 +139,7 @@ SUFFIXES = .sh -e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ + -e 's!@''pkgplugindir''@!$(pkgplugindir)!g' \ -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \ |