diff options
author | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
commit | ad0516d91e5b41286bbadc716a350b244ad8337e (patch) | |
tree | 1adb92a14ccbe505c0035f0f41b8f01c288979b0 /mysql-test/Makefile.am | |
parent | 711464a11de68abe5835a74a41f7c347a1e93b67 (diff) | |
parent | b0a6a8e13780182a172b2c0a5b6ef008b6d0645f (diff) | |
download | mariadb-git-ad0516d91e5b41286bbadc716a350b244ad8337e.tar.gz |
Merge
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
SCCS merged
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r-- | mysql-test/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index f8e1d99bfab..8ae551e2ffd 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -39,7 +39,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem std_data/server-cert.pem std_data/server-key.pem CLEANFILES = $(test_SCRIPTS) $(test_DATA) -INCLUDES = -I$(srcdir)/../include -I../include -I.. +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. EXTRA_PROGRAMS = mysql_test_run_new noinst_HEADERS = my_manage.h mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c |