From f988a7e600b2eb997d0211ee0c9e7cb436fd260a Mon Sep 17 00:00:00 2001
From: "jperkin/jonathan@chorlton.adsl.perkin.org.uk" <>
Date: Wed, 19 Dec 2007 13:24:43 +0000
Subject: 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.

---
 storage/archive/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'storage/archive')

diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index 4920527e0e9..55f2380ec31 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/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 \
@@ -33,8 +34,8 @@ noinst_HEADERS =	ha_archive.h azlib.h
 noinst_PROGRAMS	=	archive_test archive_reader
 
 EXTRA_LTLIBRARIES =	ha_archive.la
-pkglib_LTLIBRARIES =	@plugin_archive_shared_target@
-ha_archive_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
+ha_archive_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_archive_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_archive_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_archive_la_SOURCES =	ha_archive.cc azio.c
-- 
cgit v1.2.1


From e286ac998c4225fbafb5016717a6bf8c979b314c Mon Sep 17 00:00:00 2001
From: "jperkin/jonathan@chorlton.adsl.perkin.org.uk" <>
Date: Wed, 2 Jan 2008 13:00:46 +0000
Subject: Use pkglibdir to simplify pkgplugindir, and fix the path in a couple
 of Makefiles.  Continuation of the fix for bug#31736.

---
 storage/archive/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'storage/archive')

diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index 55f2380ec31..d092f091798 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -19,7 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =		$(libdir)/@PACKAGE@/plugin
+pkgplugindir =		$(pkglibdir)/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
-- 
cgit v1.2.1