diff options
author | unknown <lenz@mysql.com> | 2005-07-08 11:27:08 +0200 |
---|---|---|
committer | unknown <lenz@mysql.com> | 2005-07-08 11:27:08 +0200 |
commit | d261c2af8a26105b417dcdc7f249ab2669b7e023 (patch) | |
tree | 5698b5f0e663576ded6a3926bf918a5e5d184f7b /mysql-test/Makefile.am | |
parent | 2d4e858aa37f20f1c1861d1fd5925bbc1799b3d2 (diff) | |
parent | 3d2814d6d43bee9e885053f8e910c8c363f00550 (diff) | |
download | mariadb-git-d261c2af8a26105b417dcdc7f249ab2669b7e023.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.am | 2 |
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 |