summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-01-28 17:15:51 +0100
committerunknown <serg@serg.mylan>2005-01-28 17:15:51 +0100
commit852bdc619ab0b4abd17296b0b79edcdc8f60bca4 (patch)
tree65e0bd2ded78ce95af6345d655d3c0c160a50aaa /libmysql
parentb59aa1aa6aace8dcacdf6080a3f0dc90d05b8909 (diff)
parent5c3c40798dce878bd6561b8da6a5e1cbd9f16279 (diff)
downloadmariadb-git-852bdc619ab0b4abd17296b0b79edcdc8f60bca4.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 91ee5e66c83..0670a0befa8 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -24,7 +24,7 @@ target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
LIBS = @CLIENT_LIBS@
INCLUDES = -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
- -I$(top_srcdir)/extra
+ -I$(top_builddir)/include
include $(srcdir)/Makefile.shared