diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-09 04:14:37 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-09 04:14:37 +0000 |
| commit | 997e067c6252b376edfc7768a0495d3c863dcd33 (patch) | |
| tree | d1098877711f5fc445db52e090a6c8bfc4229db2 | |
| parent | 3059776adf7c0ab739cab4ab6efc591c1ef140d0 (diff) | |
Some autoconf settings weren't propagating to autoconf.py.
relaxng test belongs with the other CA tests.
svn path=/branches/tk685/; revision=5773
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | ca/Makefile.in | 10 | ||||
| -rw-r--r-- | ca/tests/Makefile.in | 7 |
3 files changed, 15 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 19264b1b..63705f81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,6 +28,13 @@ OPENSSL_TARGET = @OPENSSL_TARGET@ RP_TARGET = @RP_TARGET@ CA_TARGET = @CA_TARGET@ +WSGI_DAEMON_PROCESS = @WSGI_DAEMON_PROCESS@ +WSGI_PROCESS_GROUP = @WSGI_PROCESS_GROUP@ +RCYNIC_HTML_DIR = @RCYNIC_HTML_DIR@ +APACHE_VERSION = @APACHE_VERSION@ +WSGI_PYTHON_EGG_CACHE_DIR = @WSGI_PYTHON_EGG_CACHE_DIR@ +WSGI_PYTHON_EGG_CACHE_USER = @WSGI_PYTHON_EGG_CACHE_USER@ + SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@ SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'` diff --git a/ca/Makefile.in b/ca/Makefile.in index 3d69b760..bf2f812a 100644 --- a/ca/Makefile.in +++ b/ca/Makefile.in @@ -53,15 +53,7 @@ uninstall deinstall:: distclean:: rm -f installed -relaxng: - cd tests; $(MAKE) protocol-samples - xmllint --noout --relaxng ../schemas/relaxng/left-right-schema.rng tests/left-right-protocol-samples/*.xml - xmllint --noout --relaxng ../schemas/relaxng/up-down-schema.rng tests/up-down-protocol-samples/*.xml - xmllint --noout --relaxng ../schemas/relaxng/publication-schema.rng tests/publication-protocol-samples/*.xml - -all-tests:: relaxng - -test all-tests parse-test profile yamltest yamlconf:: all +test all-tests relaxng parse-test profile yamltest yamlconf:: all cd tests; $(MAKE) $@ distclean:: clean diff --git a/ca/tests/Makefile.in b/ca/tests/Makefile.in index b63e8dc3..9796dd2b 100644 --- a/ca/tests/Makefile.in +++ b/ca/tests/Makefile.in @@ -22,6 +22,13 @@ publication-protocol-samples/.stamp: publication-protocol-samples.xml split-prot xsltproc --param verbose 0 --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml touch $@ +relaxng: protocol-samples + xmllint --noout --relaxng ../../schemas/relaxng/left-right-schema.rng left-right-protocol-samples/*.xml + xmllint --noout --relaxng ../../schemas/relaxng/up-down-schema.rng up-down-protocol-samples/*.xml + xmllint --noout --relaxng ../../schemas/relaxng/publication-schema.rng publication-protocol-samples/*.xml + +all-tests:: relaxng + parse-test: protocol-samples ${PYTHON} xml-parse-test.py |