List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:January 2 2008 12:11pm
Subject:Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736
View as plain text  
* On 2007-12-19 at 18:49 GMT, Timothy Smith wrote:

> 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@?

Yes probably, I'll change it.

> By the way, why is MYSQLLIBdir= $(libdir) here, but $(pkglibdir)
> everywhere else?

Unsure, svoj added this one and sql/Makefile.am at the same time, Sergey?

> >  EXTRA_DIST =		libmysqld.def CMakeLists.txt
> >  DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
> >  			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
> >  			-DDATADIR="\"$(MYSQLDATAdir)\"" \
> >  			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
> > -			-DLIBDIR="\"$(MYSQLLIBdir)\""
> > +			-DPLUGINDIR="\"$(pkgplugindir)\""
> 
> Should LIBDIR be removed? why not keep it?

Can do, but as it is no longer used anywhere it's likely to be confusing
to keep it.  If someone needs the functionality in the future they can
easily add it back, and at the same time do it the same way as
pkgplugindir so it can be overridden if necessary.

Thanks,

-- 
Jonathan Perkin, Senior Production Engineer
MySQL AB, www.mysql.com
Thread
bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Jonathan Perkin19 Dec
  • Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Timothy Smith19 Dec
    • Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Jonathan Perkin2 Jan
      • Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Timothy Smith4 Jan
    • Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Kent Boortz4 Mar
      • Re: bk commit into 5.1 tree (jperkin:1.2645) BUG#31736Jonathan Perkin5 Mar