summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-09-22 21:51:17 -0600
committerunknown <sasha@mysql.sashanet.com>2001-09-22 21:51:17 -0600
commit30bba5dffcc400268446b12fa8ed8b875737c802 (patch)
treee4a77b49f0d4e78f22c4bc9ef9ac9b30a8a00624 /sql/Makefile.am
parent08b94f415bbce53a9bbc5a11330b7c8fadf92b81 (diff)
parent5e0851e1b37debb59dbe184fcc3485470872ac64 (diff)
downloadmariadb-git-30bba5dffcc400268446b12fa8ed8b875737c802.tar.gz
merged
include/Makefile.am: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged client/Makefile.am: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/Makefile.am: Auto merged sql/sql_lex.h: Auto merged
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 04806248cae..050abfb02b6 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = @MT_INCLUDES@ \
@bdb_includes@ @innodb_includes@ @gemini_includes@ \
-I$(srcdir)/../include \
-I$(srcdir)/../regex \
- -I$(srcdir) -I../include $(openssl_includes)
+ -I$(srcdir) -I../include -I. $(openssl_includes)
WRAPLIBS= @WRAPLIBS@
SUBDIRS = share
libexec_PROGRAMS = mysqld