diff options
| author | jperkin/jonathan@chorlton.adsl.perkin.org.uk <> | 2008-03-06 15:13:14 +0000 |
|---|---|---|
| committer | jperkin/jonathan@chorlton.adsl.perkin.org.uk <> | 2008-03-06 15:13:14 +0000 |
| commit | 2ebdd5ea2f2722974ca4c5280ad8d6b9a5d05c48 (patch) | |
| tree | f4537a5c57fb557b3abaff08029182ee06bbe09e /sql/Makefile.am | |
| parent | b80f05181b7289b420ba8e6abef0791613caef1c (diff) | |
| parent | c98e000c6f7579ac687f2b2880eec99abe953219 (diff) | |
| download | mariadb-git-2ebdd5ea2f2722974ca4c5280ad8d6b9a5d05c48.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
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 |