projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include config_proxy.xml in dist
[metaproxy-moved-to-github.git]
/
etc
/
Makefile.am
diff --git
a/etc/Makefile.am
b/etc/Makefile.am
index
2b4198d
..
50e4d4c
100644
(file)
--- a/
etc/Makefile.am
+++ b/
etc/Makefile.am
@@
-1,4
+1,3
@@
-# $Id: Makefile.am,v 1.7 2006-11-29 21:43:37 marc Exp $
# This doesn't actually build anything, it just tests whether the
# configuration files here correspond with the schema.
# This doesn't actually build anything, it just tests whether the
# configuration files here correspond with the schema.
@@
-7,19
+6,27
@@
etcdatadir = $(pkgdatadir)/etc
xmlconfig = $(srcdir)/config-bytarget.xml \
$(srcdir)/config-local.xml \
xmlconfig = $(srcdir)/config-bytarget.xml \
$(srcdir)/config-local.xml \
+ $(srcdir)/config-load-balance.xml \
$(srcdir)/config-record-transform.xml \
$(srcdir)/config-shared1.xml \
$(srcdir)/config-simple-multi.xml \
$(srcdir)/config-sru-to-z3950.xml \
$(srcdir)/config-record-transform.xml \
$(srcdir)/config-shared1.xml \
$(srcdir)/config-simple-multi.xml \
$(srcdir)/config-sru-to-z3950.xml \
+ $(srcdir)/config-sru-holdings.xml \
$(srcdir)/config-zurg.xml \
$(srcdir)/config0.xml \
$(srcdir)/config1.xml \
$(srcdir)/config2.xml \
$(srcdir)/config3.xml \
$(srcdir)/config4.xml \
$(srcdir)/config-zurg.xml \
$(srcdir)/config0.xml \
$(srcdir)/config1.xml \
$(srcdir)/config2.xml \
$(srcdir)/config3.xml \
$(srcdir)/config4.xml \
- $(srcdir)/config5.xml
+ $(srcdir)/config5.xml \
+ $(srcdir)/config-cgi.xml \
+ $(srcdir)/config-solr.xml \
+ $(srcdir)/config-zoom.xml \
+ $(srcdir)/config-proxy.xml \
+ $(srcdir)/retrieval-info.xml
-config = example.simple-auth example.target-auth pqf2pqf.xsl
+config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml \
+ ztest.pem
rng = $(srcdir)/../xml/schema/metaproxy.rng
rng = $(srcdir)/../xml/schema/metaproxy.rng
@@
-27,19
+34,20
@@
xsd = $(srcdir)/../xml/schema/metaproxy.xsd
etcdata_DATA = $(xmlconfig) $(config)
etcdata_DATA = $(xmlconfig) $(config)
-EXTRA_DIST = $(etcdata_DATA)
+EXTRA_DIST = $(etcdata_DATA) cgi.sh
.PHONY: check_rng
.PHONY: check_rng
-check_rng:
- xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
+check_rng:
+ if test -f $(rng); then \
+ xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig); \
+ fi
+## Only run XSD checks for a "new" Libxml2
.PHONY: check_xsd
check_xsd:
.PHONY: check_xsd
check_xsd:
- xmllint --noout --xinclude --schema $(xsd) $(xmlconfig)
+ if test `xmllint --version 2>&1 |head -1|awk '{print $$5}'` -gt 20622; then xmllint --noout --xinclude --schema $(xsd) $(xmlconfig); fi
-
-check-local:
- $(MAKE) check_xsd
- $(MAKE) check_rng
+#check-local: check_rng check_xsd
+check-local: check_rng