From ad367fe00a28d4d3b652900344597f6517fa8462 Mon Sep 17 00:00:00 2001 From: unknown 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: Use pkglibdir plugin/daemon_example/Makefile.am: Use pkglibdir plugin/fulltext/Makefile.am: Use pkglibdir scripts/Makefile.am: Use pkglibdir scripts/make_binary_distribution.sh: Update comment sql/Makefile.am: Use pkglibdir storage/archive/Makefile.am: Use pkglibdir storage/blackhole/Makefile.am: Use pkglibdir storage/example/Makefile.am: Use pkglibdir, fix pkgplugindir storage/federated/Makefile.am: Use pkglibdir storage/innobase/Makefile.am: Use pkglibdir, fix pkgplugindir --- plugin/daemon_example/Makefile.am | 2 +- plugin/fulltext/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugin') 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 -- cgit v1.2.1