diff options
| author | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
|---|---|---|
| committer | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
| commit | 45ebe9953385f48f99058eaedf448bb6ff8caeaa (patch) | |
| tree | 1cd9471bfb066e2ed5fdc557a5948b95230098ec /sql/Makefile.am | |
| parent | 27c0540bd8e785499accbd4777bdb5067911cce9 (diff) | |
| parent | 19afc9d9e75b44c01e254300913b716798c40108 (diff) | |
| download | mariadb-git-45ebe9953385f48f99058eaedf448bb6ff8caeaa.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/drop.result:
SCCS merged
mysql-test/t/drop.test:
SCCS merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 194b6ab29ef..3a6f4bcb7a2 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -19,6 +19,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) +pkgplugindir = $(pkglibdir)/plugin INCLUDES = @ZLIB_INCLUDES@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes) @@ -138,7 +139,7 @@ DEFS = -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ - -DLIBDIR="\"$(MYSQLLIBdir)\"" \ + -DPLUGINDIR="\"$(pkgplugindir)\"" \ @DEFS@ BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h |