summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tomas@mc05.(none)>2004-04-18 16:00:51 +0200
committerunknown <tomas@mc05.(none)>2004-04-18 16:00:51 +0200
commitc3a55b03db4824c516c5505bcb5d83edb8ab6a98 (patch)
tree20a75d9c2f23a826e1f453d019c2007c85fa2caa
parent5300456bf3796e7e0d7fde8f3d7fd05008ac4af0 (diff)
downloadmariadb-git-c3a55b03db4824c516c5505bcb5d83edb8ab6a98.tar.gz
Makefile.am:
fix for embedded server and ndbcluster make libmysqld/Makefile.am: fix for embedded server and ndbcluster make
-rw-r--r--libmysqld/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 4e65fa9364e..51e8271c001 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -26,7 +26,7 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
+INCLUDES= @MT_INCLUDES@ @ndbcluster_includes@ @bdb_includes@ -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/regex \
$(openssl_includes)
@@ -70,7 +70,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)/myisam/libmyisam.a \
$(top_builddir)/myisammrg/libmyisammrg.a \
$(top_builddir)/heap/libheap.a \
- @innodb_libs@ @bdb_libs_with_path@ \
+ @ndbcluster_libs@ @innodb_libs@ @bdb_libs_with_path@ \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \