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.

---
 libmysqld/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libmysqld/Makefile.am')

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 \
-- 
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.

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

(limited to 'libmysqld/Makefile.am')

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 117f8752629..446f2bf7f91 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -21,7 +21,7 @@ MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 MYSQLLIBdir=            $(libdir)
-pkgplugindir =		$(libdir)/@PACKAGE@/plugin
+pkgplugindir =		$(pkglibdir)/plugin
 
 EXTRA_DIST =		libmysqld.def CMakeLists.txt
 DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-- 
cgit v1.2.1