diff options
author | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
---|---|---|
committer | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
commit | df33aacd87ff08c27fd371a0bb348fe3986e6f95 (patch) | |
tree | 0c9f1805d1951780ff34fb797c8fec0193020aab /sql/Makefile.am | |
parent | 2bddb0766473270f43e70bed16f3223255fee4a9 (diff) | |
parent | 3e5508909f7b7bebabfca5711e5778927279be19 (diff) | |
download | mariadb-git-df33aacd87ff08c27fd371a0bb348fe3986e6f95.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index f1d43c9c660..5516f3b6964 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -19,6 +19,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) INCLUDES = @ZLIB_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ @@ -116,6 +117,7 @@ DEFS = -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ + -DLIBDIR="\"$(MYSQLLIBdir)\"" \ @DEFS@ BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h |