diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-07-27 17:39:07 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-07-27 17:39:07 +0200 |
| commit | 519ebab04edcbda779d304db7f7889f106ee9782 (patch) | |
| tree | 7000db2674276a84a593f61f87013043d99b45b4 | |
| parent | db5ad35ec95176043ce306c1cab254c334c624a0 (diff) | |
| download | mariadb-git-519ebab04edcbda779d304db7f7889f106ee9782.tar.gz | |
SSL/Makefile.am mysql-test/Makefile.am:
Moved CERT files to where they are used, avoids conflict
between two make files trying to install the same CERTs
SSL/*.pem,
Move: SSL/*.pem -> mysql-test/std_data/
| -rw-r--r-- | SSL/Makefile.am | 4 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 18 | ||||
| -rw-r--r-- | mysql-test/std_data/cacert.pem (renamed from SSL/cacert.pem) | 0 | ||||
| -rw-r--r-- | mysql-test/std_data/client-cert.pem (renamed from SSL/client-cert.pem) | 0 | ||||
| -rw-r--r-- | mysql-test/std_data/client-key.pem (renamed from SSL/client-key.pem) | 0 | ||||
| -rw-r--r-- | mysql-test/std_data/server-cert.pem (renamed from SSL/server-cert.pem) | 0 | ||||
| -rw-r--r-- | mysql-test/std_data/server-key.pem (renamed from SSL/server-key.pem) | 0 |
7 files changed, 2 insertions, 20 deletions
diff --git a/SSL/Makefile.am b/SSL/Makefile.am index 5fc44d3a247..30a6fc3c995 100644 --- a/SSL/Makefile.am +++ b/SSL/Makefile.am @@ -15,9 +15,7 @@ ## Process this file with automake to create Makefile.in -EXTRA_DIST= NOTES cacert.pem client-cert.pem client-key.pem \ - run-client run-server server-cert.pem \ - server-key.pem +EXTRA_DIST= NOTES run-client run-server # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 1920a68b21b..439b13af779 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -37,12 +37,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) -test_DATA = std_data/client-key.pem \ - std_data/client-cert.pem \ - std_data/cacert.pem \ - std_data/server-cert.pem \ - std_data/server-key.pem -CLEANFILES = $(GENSCRIPTS) $(test_DATA) +CLEANFILES = $(GENSCRIPTS) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. @@ -111,17 +106,6 @@ install-data-local: uninstall-local: @RM@ -f -r $(DESTDIR)$(testdir) -std_data/client-key.pem: $(top_srcdir)/SSL/$(@F) - @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data -std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F) - @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data -std_data/cacert.pem: $(top_srcdir)/SSL/$(@F) - @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data -std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F) - @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data -std_data/server-key.pem: $(top_srcdir)/SSL/$(@F) - @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data - # mtr - a shortcut for executing mysql-test-run.pl mtr: $(RM) -f mtr diff --git a/SSL/cacert.pem b/mysql-test/std_data/cacert.pem index b445e77d7c4..b445e77d7c4 100644 --- a/SSL/cacert.pem +++ b/mysql-test/std_data/cacert.pem diff --git a/SSL/client-cert.pem b/mysql-test/std_data/client-cert.pem index fdd5c86a23f..fdd5c86a23f 100644 --- a/SSL/client-cert.pem +++ b/mysql-test/std_data/client-cert.pem diff --git a/SSL/client-key.pem b/mysql-test/std_data/client-key.pem index 22f8e23ab2a..22f8e23ab2a 100644 --- a/SSL/client-key.pem +++ b/mysql-test/std_data/client-key.pem diff --git a/SSL/server-cert.pem b/mysql-test/std_data/server-cert.pem index f420b4f3124..f420b4f3124 100644 --- a/SSL/server-cert.pem +++ b/mysql-test/std_data/server-cert.pem diff --git a/SSL/server-key.pem b/mysql-test/std_data/server-key.pem index a4842624c0c..a4842624c0c 100644 --- a/SSL/server-key.pem +++ b/mysql-test/std_data/server-key.pem |