diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-28 12:33:10 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-28 12:33:10 +0200 |
| commit | 0a77e7c42707c02f52ed7c889b54c367ea2b283c (patch) | |
| tree | 5e86f7a523d80c1970c53f12279d740355f847bc | |
| parent | ab1f1e190cc4bfd19e5ce7bcea2488908d2e75c1 (diff) | |
| parent | 02255fd7e749c4d2087a3d8623c3171ba3ff79f4 (diff) | |
| download | mariadb-git-0a77e7c42707c02f52ed7c889b54c367ea2b283c.tar.gz | |
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysql-test/Makefile.am:
Auto merged
| -rw-r--r-- | mysql-test/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 57b22f0edbc..06897852f17 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -27,7 +27,7 @@ CLEANFILES = $(test_SCRIPTS) dist-hook: mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data @@ -41,6 +41,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include |