summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-07-08 21:09:50 +0200
committerunknown <lenz@mysql.com>2005-07-08 21:09:50 +0200
commit31a5bba4434810ae9b1f47ae76ee9d7377ae5483 (patch)
tree1d7047db0f9ff4bf2b7429a27503d753c15e5977 /mysql-test/Makefile.am
parent6eedec6889e8e7c080be4f6ff896a9b3e4c6cf6d (diff)
parent284e241c46e4ab5badd6400b4c1073e88cb26065 (diff)
downloadmariadb-git-31a5bba4434810ae9b1f47ae76ee9d7377ae5483.tar.gz
Merge
mysql-test/Makefile.am: Auto merged scripts/make_binary_distribution.sh: SCCS merged
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 4e1cbd516a6..8ae551e2ffd 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -48,7 +48,6 @@ 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
@@ -71,7 +70,6 @@ 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