diff options
author | unknown <serg@serg.mysql.com> | 2001-04-13 21:16:53 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-04-13 21:16:53 +0200 |
commit | 5128e3750d6296017ffd86497516133ee4285386 (patch) | |
tree | 0748ec62096feda86a14c512244d6302323d8282 /sql/Makefile.am | |
parent | b5fa754f7ba4b416e608cc624c596f89a9db84fd (diff) | |
parent | 582174606766c66b7ae474fa0671bec6c162347f (diff) | |
download | mariadb-git-5128e3750d6296017ffd86497516133ee4285386.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 0c33213a763..4291c3f3c7b 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -21,7 +21,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) INCLUDES = @MT_INCLUDES@ \ - @bdb_includes@ @innobase_includes@ @gemini_includes@ \ + @bdb_includes@ @innodb_includes@ @gemini_includes@ \ -I$(srcdir)/../include \ -I$(srcdir)/../regex \ -I$(srcdir) -I../include -I.. -I. |