diff options
| author | unknown <joerg@mysql.com> | 2005-03-03 16:01:39 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-03 16:01:39 +0100 |
| commit | 5a9efeedf17f78b1917d9ed751764208063c0f09 (patch) | |
| tree | a8b9c701f13533c52d80cab03fbd5c7240eeba75 /mysql-test/Makefile.am | |
| parent | 2860a7723e8df63022c0f7a5aa3ab52996c798ed (diff) | |
| download | mariadb-git-5a9efeedf17f78b1917d9ed751764208063c0f09.tar.gz | |
Ensure that '*.disabled' files are truly optional, so that their non-existence
will not cause "make" to fail.
mysql-test/Makefile.am:
Files of the '*.disabled' pattern may exist, but need not.
So it is important to ignore command failures arising from this pattern not finding
any matches - whereas files of the other types must be present.
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index a749d2bd4d1..6bcd0715ccd 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -45,7 +45,8 @@ 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 - $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.disabled $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t $(INSTALL_DATA) $(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/*.result.es $(srcdir)/r/*.require $(distdir)/r @@ -63,7 +64,7 @@ install-data-local: $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(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 |