summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-07-05 23:24:48 +0200
committerkent@mysql.com <>2005-07-05 23:24:48 +0200
commita7be42163a635d80516ce9398881091fc0e6a63b (patch)
tree46d2e6253bab908e4eabff243b4542a9632468e2 /libmysqld
parent62173c5a9d8fcd1f9b365f3cbf14198d06b2170e (diff)
downloadmariadb-git-a7be42163a635d80516ce9398881091fc0e6a63b.tar.gz
Makefile.am:
Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am3
-rw-r--r--libmysqld/examples/Makefile.am3
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index f578e87ae4a..f4e9d4e6b39 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -25,7 +25,8 @@ 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@ @bdb_includes@ \
+ -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 278aa66b328..d19023c100f 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -30,7 +30,8 @@ link_sources:
done;
DEFS = -DEMBEDDED_LIBRARY
-INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
+INCLUDES = @MT_INCLUDES@ \
+ -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@