X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2FMakefile.am;h=5dbb9fb2be70c143746d8d687e3916e8ef7063b3;hb=1b9283b18eccbe5b776be0fae8a396228b03f099;hp=977277b627361a7f7d373c351bf649913541904b;hpb=275c61aaf848a6c167a9a593fae7ca8e55f4cb73;p=metaproxy-moved-to-github.git

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 977277b..5dbb9fb 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.10 2007-02-01 07:49:20 marc Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
@@ -12,6 +11,7 @@ xmlconfig = $(srcdir)/config-bytarget.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 \
@@ -19,9 +19,15 @@ xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config3.xml \
     $(srcdir)/config4.xml \
     $(srcdir)/config5.xml \
+    $(srcdir)/config-cgi.xml \
+    $(srcdir)/config-solr.xml \
+    $(srcdir)/config-zoom.xml \
+    $(srcdir)/config-proxy.xml \
+    $(srcdir)/config-rewrite.xml \
     $(srcdir)/retrieval-info.xml
 
-config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml
+config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml \
+	ztest.pem
 
 
 rng = $(srcdir)/../xml/schema/metaproxy.rng
@@ -29,19 +35,20 @@ xsd = $(srcdir)/../xml/schema/metaproxy.xsd
 
 etcdata_DATA = $(xmlconfig) $(config)
 
-EXTRA_DIST = $(etcdata_DATA)
+EXTRA_DIST = $(etcdata_DATA) cgi.sh
 
 .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: 
-	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