Use pkglibdir to simplify pkgplugindir, and fix the path in a

couple of Makefiles.  Continuation of the fix for bug#31736.

11 files changed, 11 insertions, 12 deletions

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 \
diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am
index 4256fecd873..c5414cd46c7 100644
--- a/plugin/daemon_example/Makefile.am
+++ b/plugin/daemon_example/Makefile.am
@@ -18,7 +18,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 \
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am
index 2b9d075bae0..343416072dd 100644
--- a/plugin/fulltext/Makefile.am
+++ b/plugin/fulltext/Makefile.am
@@ -15,7 +15,7 @@
 
 #Makefile.am example for a plugin
 
-pkgplugindir=$(libdir)/@PACKAGE@/plugin
+pkgplugindir=$(pkglibdir)/plugin
 INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
 #noinst_LTLIBRARIES= mypluglib.la
 pkgplugin_LTLIBRARIES= mypluglib.la
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8669e075959..73c22031990 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -90,7 +90,7 @@ CLEANFILES =		@server_scripts@ \
 			mysql_tableinfo \
 			mysqld_multi
 
-pkgplugindir =		$(libdir)/@PACKAGE@/plugin
+pkgplugindir =		$(pkglibdir)/plugin
 
 # Default same as 'pkgdatadir', but we can override it
 pkgsuppdir =		$(datadir)/@PACKAGE@
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 88397052815..864e78657b0 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -30,8 +30,7 @@
 #    "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"
+#    "pkgplugindir"  is set to "$pkglibdir/plugin"
 #    "pkgsuppdir"    is set to "@prefix@/support-files",
 #                    normally the same as "datadir"
 #
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 02a92dee7a7..92ae7a05df7 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -19,7 +19,7 @@ MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =		$(libdir)/@PACKAGE@/plugin
+pkgplugindir =		$(pkglibdir)/plugin
 INCLUDES =		@ZLIB_INCLUDES@ \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
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 \
diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am
index 9810dff5866..db4f67cf847 100644
--- a/storage/blackhole/Makefile.am
+++ b/storage/blackhole/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 \
diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am
index bf121e70f29..4b2f165377c 100644
--- a/storage/example/Makefile.am
+++ b/storage/example/Makefile.am
@@ -19,7 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =		$(libdir)/@PACKAGE@/libdir
+pkgplugindir =		$(pkglibdir)/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index d2ee37c402a..64ea0207017 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/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 \
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
index 8a5ce6d8a4b..563522cd032 100644
--- a/storage/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -19,7 +19,7 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =		$(libdir)/@PACKAGE@/libdir
+pkgplugindir =		$(pkglibdir)/plugin
 INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/storage/innobase/include \