From: Date: January 2 2008 2:00pm Subject: bk commit into 5.1 tree (jperkin:1.2646) BUG#31736 List-Archive: http://lists.mysql.com/commits/40484 X-Bug: 31736 Message-Id: <20080102130053.8580B6C8144@chorlton.adsl.perkin.org.uk> Below is the list of changes that have just been committed into a local 5.1 repository of jperkin. When jperkin does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2008-01-02 13:00:46+00:00, jperkin@stripped +11 -0 Use pkglibdir to simplify pkgplugindir, and fix the path in a couple of Makefiles. Continuation of the fix for bug#31736. libmysqld/Makefile.am@stripped, 2008-01-02 13:00:41+00:00, jperkin@stripped +1 -1 Use pkglibdir plugin/daemon_example/Makefile.am@stripped, 2008-01-02 13:00:41+00:00, jperkin@stripped +1 -1 Use pkglibdir plugin/fulltext/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir scripts/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir scripts/make_binary_distribution.sh@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -2 Update comment sql/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir storage/archive/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir storage/blackhole/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir storage/example/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir, fix pkgplugindir storage/federated/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir storage/innobase/Makefile.am@stripped, 2008-01-02 13:00:42+00:00, jperkin@stripped +1 -1 Use pkglibdir, fix pkgplugindir diff -Nrup a/libmysqld/Makefile.am b/libmysqld/Makefile.am --- a/libmysqld/Makefile.am 2007-12-19 10:26:20 +00:00 +++ b/libmysqld/Makefile.am 2008-01-02 13:00:41 +00:00 @@ -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 -Nrup a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am --- a/plugin/daemon_example/Makefile.am 2007-12-19 10:28:10 +00:00 +++ b/plugin/daemon_example/Makefile.am 2008-01-02 13:00:41 +00:00 @@ -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 -Nrup a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am --- a/plugin/fulltext/Makefile.am 2007-12-19 10:29:28 +00:00 +++ b/plugin/fulltext/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/scripts/Makefile.am b/scripts/Makefile.am --- a/scripts/Makefile.am 2007-12-19 10:30:32 +00:00 +++ b/scripts/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh --- a/scripts/make_binary_distribution.sh 2007-12-19 10:32:14 +00:00 +++ b/scripts/make_binary_distribution.sh 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/sql/Makefile.am b/sql/Makefile.am --- a/sql/Makefile.am 2007-12-19 10:34:56 +00:00 +++ b/sql/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/storage/archive/Makefile.am b/storage/archive/Makefile.am --- a/storage/archive/Makefile.am 2007-12-19 11:03:03 +00:00 +++ b/storage/archive/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am --- a/storage/blackhole/Makefile.am 2007-12-19 11:05:09 +00:00 +++ b/storage/blackhole/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/storage/example/Makefile.am b/storage/example/Makefile.am --- a/storage/example/Makefile.am 2007-12-19 11:07:59 +00:00 +++ b/storage/example/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/storage/federated/Makefile.am b/storage/federated/Makefile.am --- a/storage/federated/Makefile.am 2007-12-19 11:09:33 +00:00 +++ b/storage/federated/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 -Nrup a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am --- a/storage/innobase/Makefile.am 2007-12-19 10:56:29 +00:00 +++ b/storage/innobase/Makefile.am 2008-01-02 13:00:42 +00:00 @@ -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 \