diff options
| author | unknown <kent@mysql.com> | 2005-06-19 20:09:28 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-06-19 20:09:28 +0200 |
| commit | c7e49b6bd689b9adf3a7f6f28766fc05efb78f41 (patch) | |
| tree | 9aefd51c6946802c7ed1900a367748ad4e998072 /mysql-test/Makefile.am | |
| parent | 6f86198b4bd93f8eafc089db8219ff79e20aa236 (diff) | |
| parent | f35c177a2a754c0b09b01c59d1d958f124382c19 (diff) | |
| download | mariadb-git-c7e49b6bd689b9adf3a7f6f28766fc05efb78f41.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 3a59a060778..f8e1d99bfab 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -88,9 +88,16 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib -std_data/%.pem: +std_data/client-key.pem: + @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data +std_data/client-cert.pem: + @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data +std_data/cacert.pem: + @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data +std_data/server-cert.pem: + @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data +std_data/server-key.pem: @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data - SUFFIXES = .sh |