diff options
| author | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2007-12-19 13:24:43 +0000 |
|---|---|---|
| committer | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2007-12-19 13:24:43 +0000 |
| commit | 92e31e96a2c6f2f98e77217534fcc3712e7b4fa5 (patch) | |
| tree | 7e366b1d392d7928acf0727223f607ab5edd44d4 /scripts | |
| parent | 333af686bf68b4c0e6d424ce07dda2196df4a2c3 (diff) | |
| download | mariadb-git-92e31e96a2c6f2f98e77217534fcc3712e7b4fa5.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.
libmysqld/Makefile.am:
Use pkgplugindir.
plugin/daemon_example/Makefile.am:
Use pkgplugindir.
plugin/fulltext/Makefile.am:
Use pkgplugindir.
scripts/Makefile.am:
Add pkgplugindir.
scripts/make_binary_distribution.sh:
Add pkgplugindir.
scripts/mysql_config.sh:
Add pkgplugindir.
sql/Makefile.am:
Use pkgplugindir.
sql/mysqld.cc:
Use PLUGINDIR, derived from pkgplugindir, instead of
LIBDIR for plugins.
sql/unireg.h:
Use PLUGINDIR instead of LIBDIR, and define to be the
default setting of pkgplugindir.
storage/innobase/Makefile.am:
Use pkgplugindir.
storage/archive/Makefile.am:
Use pkgplugindir.
storage/blackhole/Makefile.am:
Use pkgplugindir.
storage/example/Makefile.am:
Use pkgplugindir.
storage/federated/Makefile.am:
Use pkgplugindir.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 3 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 4 |
3 files changed, 10 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' \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 8d3e2133a45..88397052815 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -30,6 +30,8 @@ # "pkglibdir" is set to the same as "libdir" # "pkgincludedir" is set to the same as "includedir" # "pkgdatadir" is set to the same as "datadir" +# "pkgplugindir" is set to "@prefix@/lib/plugin", +# normally "$libdir/plugin" # "pkgsuppdir" is set to "@prefix@/support-files", # normally the same as "datadir" # @@ -204,6 +206,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then pkglibdir=@pkglibdir@ \ pkgincludedir=@pkgincludedir@ \ pkgdatadir=@pkgdatadir@ \ + pkgplugindir=@pkgplugindir@ \ pkgsuppdir=@pkgsuppdir@ \ mandir=@mandir@ \ infodir=@infodir@ diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index ae58655ed0f..110c425ea5b 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -87,6 +87,8 @@ pkglibdir='@pkglibdir@' pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` fix_path pkglibdir $pkglibdir_rel lib/mysql lib +plugindir='@pkgplugindir@' + pkgincludedir='@pkgincludedir@' fix_path pkgincludedir include/mysql include @@ -147,6 +149,7 @@ Options: --include [$include] --libs [$libs] --libs_r [$libs_r] + --plugindir [$plugindir] --socket [$socket] --port [$port] --version [$version] @@ -163,6 +166,7 @@ while test $# -gt 0; do --include) echo "$include" ;; --libs) echo "$libs" ;; --libs_r) echo "$libs_r" ;; + --plugindir) echo "$plugindir" ;; --socket) echo "$socket" ;; --port) echo "$port" ;; --version) echo "$version" ;; |