diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
| commit | c9dbb4b72640ecfc063f06f9373ac42ef3d9775f (patch) | |
| tree | 68a7e089d65a9c4434527dfc1e58ba2f98a15a88 /sql-bench/Makefile.am | |
| parent | d7c5327db62886135dcb14ba1d9d117eaeaf6100 (diff) | |
| parent | 23d5f3f96546ce146c0986c53b114761b56a8650 (diff) | |
| download | mariadb-git-c9dbb4b72640ecfc063f06f9373ac42ef3d9775f.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
Auto merged
client/mysqlbinlog.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql-bench/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Docs/manual.texi:
merge
include/mysql_com.h:
merge
include/mysqld_error.h:
merge
mysql-test/install_test_db.sh:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/share/czech/errmsg.txt:
merge
sql/share/danish/errmsg.txt:
merge
sql/share/dutch/errmsg.txt:
merge
sql/share/english/errmsg.txt:
merge
sql/share/estonian/errmsg.txt:
merge
sql/share/french/errmsg.txt:
merge
sql/share/german/errmsg.txt:
merge
sql/share/greek/errmsg.txt:
merge
sql/share/hungarian/errmsg.txt:
merge
sql/share/italian/errmsg.txt:
merge
sql/share/japanese/errmsg.txt:
merge
sql/share/korean/errmsg.txt:
merge
sql/share/norwegian-ny/errmsg.txt:
merge
sql/share/norwegian/errmsg.txt:
merge
sql/share/polish/errmsg.txt:
merge
sql/share/portuguese/errmsg.txt:
merge
sql/share/romanian/errmsg.txt:
merge
sql/share/russian/errmsg.txt:
merge
sql/share/slovak/errmsg.txt:
merge
sql/share/spanish/errmsg.txt:
merge
sql/share/swedish/errmsg.txt:
merge
sql/sql_base.cc:
merge
sql/sql_table.cc:
merge
Diffstat (limited to 'sql-bench/Makefile.am')
| -rw-r--r-- | sql-bench/Makefile.am | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am index 5712373c405..e9c3e07beef 100644 --- a/sql-bench/Makefile.am +++ b/sql-bench/Makefile.am @@ -37,12 +37,12 @@ dist-hook: mkdir -p $(distdir)/Data/ATIS $(distdir)/Data/Wisconsin \ $(distdir)/Results $(distdir)/Results-win32 \ $(distdir)/limits $(distdir)/Comments - $(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data/ATIS - $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data/Wisconsin - $(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/Results - $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/Results-win32 - $(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/limits - $(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/Comments + for i in $(srcdir)/Data/ATIS/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Data/ATIS ; done + for i in $(srcdir)/Data/Wisconsin/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Data/Wisconsin ; done + for i in $(srcdir)/Results/*-* ; do $(INSTALL_DATA) $$i $(distdir)/Results; done + for i in $(srcdir)/Results-win32/*-* ; do $(INSTALL_DATA) $$i $(distdir)/Results-win32; done + for i in $(srcdir)/limits/*.* ; do $(INSTALL_DATA) $$i $(distdir)/limits; done + for i in $(srcdir)/Comments/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Comments; done install-data-local: $(mkinstalldirs) \ @@ -54,12 +54,13 @@ install-data-local: $(DESTDIR)$(benchdir)/limits \ $(DESTDIR)$(benchdir)/Comments $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(benchdir) - $(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(DESTDIR)$(benchdir)/Data/ATIS - $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(DESTDIR)$(benchdir)/Data/Wisconsin - $(INSTALL_DATA) $(srcdir)/Results/*-* $(DESTDIR)$(benchdir)/Results - $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(DESTDIR)$(benchdir)/Results-win32 - $(INSTALL_DATA) $(srcdir)/limits/*.* $(DESTDIR)$(benchdir)/limits - $(INSTALL_DATA) $(srcdir)/Comments/*.* $(DESTDIR)$(benchdir)/Comments + for i in $(srcdir)/Data/ATIS/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Data/ATIS ; done + for i in $(srcdir)/Data/Wisconsin/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Data/Wisconsin ; done + for i in $(srcdir)/Results/*-* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Results; done + for i in $(srcdir)/Results-win32/*-* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Results-win32; done + for i in $(srcdir)/limits/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/limits; done + for i in $(srcdir)/Comments/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Comments; done + SUFFIXES = .sh |