diff options
| author | joerg@trift-lap.fambruehe <> | 2007-04-26 17:11:33 +0200 |
|---|---|---|
| committer | joerg@trift-lap.fambruehe <> | 2007-04-26 17:11:33 +0200 |
| commit | 044f2e110e98ef3a0cb88ea7d7d322f2a5ecfa1d (patch) | |
| tree | 24ee23cf3e00208526f0654d43d6cf628b530e2a /mysql-test | |
| parent | f7bac607cf649707f900f988956d694a9653f45b (diff) | |
| parent | 03f4492b5bbb69ead1e9a343471e6012ea2db8d0 (diff) | |
| download | mariadb-git-044f2e110e98ef3a0cb88ea7d7d322f2a5ecfa1d.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
into trift-lap.fambruehe:/MySQL/M51/push-5.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 839dc434e46..1e9371e5bf2 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -24,7 +24,7 @@ benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ valgrind.supp $(PRESCRIPTS) -EXTRA_DIST = $(EXTRA_SCRIPTS) +EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run PRESCRIPTS = mysql-test-run.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) @@ -71,6 +71,7 @@ dist-hook: $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50 $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51 $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib + -rm -rf `find $(distdir)/suite -type d -name SCCS` install-data-local: $(mkinstalldirs) \ @@ -112,6 +113,12 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50 $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51 $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib + for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \ + do \ + d=$(DESTDIR)$(testdir)/`dirname $$f`; \ + mkdir -p $$d ; \ + $(INSTALL_DATA) $(srcdir)/$$f $$d ; \ + done uninstall-local: @RM@ -f -r $(DESTDIR)$(testdir) |