summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-07-08 21:13:14 +0200
committerunknown <lenz@mysql.com>2005-07-08 21:13:14 +0200
commit3dcb7232d9d591241a2aca0c7e8196a1d70ff86a (patch)
tree6064ed86512bd76f0db7f73a24a34279e7cbe8c1 /mysql-test/Makefile.am
parent1492bd45bb289f807c497eae187c5df1ab034049 (diff)
downloadmariadb-git-3dcb7232d9d591241a2aca0c7e8196a1d70ff86a.tar.gz
- reverted and optimized a 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..7c7ceb349a4 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