summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-07-08 11:27:08 +0200
committerunknown <lenz@mysql.com>2005-07-08 11:27:08 +0200
commita7088fd39d0fcdc946f22b26ea583eb8ea159240 (patch)
tree5698b5f0e663576ded6a3926bf918a5e5d184f7b /mysql-test/Makefile.am
parent17c97d75ef1948d44f1c6e263084f7d9fd450627 (diff)
parenta652b17901b2f97278004fff3d7672b2cb6e4db8 (diff)
downloadmariadb-git-a7088fd39d0fcdc946f22b26ea583eb8ea159240.tar.gz
- manual merge of the addition of including mysqlt-test/t/*.def
mysql-test/Makefile.am: - manual merge scripts/make_binary_distribution.sh: - manual merge
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 8ae551e2ffd..4e1cbd516a6 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -48,6 +48,7 @@ mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c
dist-hook:
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/lib
+ $(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
@@ -70,6 +71,7 @@ install-data-local:
$(DESTDIR)$(testdir)/std_data \
$(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
+ $(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t