Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736

[Kent Boortz]

Timothy Smith <tim@stripped> writes:
> On Wed, Dec 19, 2007 at 01:24:50PM +0000, Jonathan Perkin wrote:
>> diff -Nrup a/libmysqld/Makefile.am b/libmysqld/Makefile.am
>> --- a/libmysqld/Makefile.am	2007-08-31 00:23:07 +01:00
>> +++ b/libmysqld/Makefile.am	2007-12-19 10:26:20 +00:00
>> @@ -21,13 +21,14 @@ MYSQLDATAdir =		$(localstatedir)
>>  MYSQLSHAREdir =		$(pkgdatadir)
>>  MYSQLBASEdir=		$(prefix)
>>  MYSQLLIBdir=            $(libdir)
>> +pkgplugindir =		$(libdir)/@PACKAGE@/plugin
>
> Should this use $(pkglibdir) instead of $(libdir)/@PACKAGE@?

I second this, if no problem when you test it, please use
$(pkglibdir). Would mean our build scripts needs no change.

For documentation, note that this means that for the builds done at
MySQL, the packages that has "/usr/local/mysql" as prefix will have
the plugins in "/usr/local/mysql/lib/plugin", but the builds that has
"/usr" as prefix (RPMs mainly) will use "/usr/lib/mysql/plugin". This
is as it should be.

The change looks good!

kent

-- 
Kent Boortz, Senior Production Engineer
MySQL AB, www.mysql.com
Office: [phone] ext. 4450 (VoIP)
Office: [phone]
Mobile: [phone]