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
Removed definition of docdir. It is set by automake already
[metaproxy-moved-to-github.git]
/
etc
/
Makefile.am
diff --git
a/etc/Makefile.am
b/etc/Makefile.am
index
f74d429
..
29f1dd9
100644
(file)
--- a/
etc/Makefile.am
+++ b/
etc/Makefile.am
@@
-1,4
+1,4
@@
-# $Id: Makefile.am,v 1.8 2007-01-02 15:35:36 marc Exp $
+# $Id: Makefile.am,v 1.12 2007-02-17 13:03:29 adam 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.
@@
-18,9
+18,10
@@
xmlconfig = $(srcdir)/config-bytarget.xml \
$(srcdir)/config2.xml \
$(srcdir)/config3.xml \
$(srcdir)/config4.xml \
$(srcdir)/config2.xml \
$(srcdir)/config3.xml \
$(srcdir)/config4.xml \
- $(srcdir)/config5.xml
+ $(srcdir)/config5.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
rng = $(srcdir)/../xml/schema/metaproxy.rng
rng = $(srcdir)/../xml/schema/metaproxy.rng
@@
-34,13
+35,11
@@
EXTRA_DIST = $(etcdata_DATA)
check_rng:
xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
check_rng:
xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
+## 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