--- a/Makefile	Tue Jan 24 13:23:44 2006 -0500
+++ b/Makefile	Thu Jan 26 16:51:15 2006 -0500
@@ -11,6 +11,10 @@
 SGML_CATALOG_FILES=/etc/sgml/catalog
 OUTPUT=$(addprefix $(PACKAGE),.html .pdf .txt) $(PACKAGE)
 INSTALL_DIR=$(TOP)/install
+xml_validate=xmllint --xinclude $(1) |			\
+	sed -e 's/\(xmlns:xi\|xml:base\)="[^"]*"//g' |	\
+	xmllint --valid --noout - 2>&1 | sed 's/^-:/$(1):/'
+html_validate=true
 
 all: $(OUTPUT)
 
@@ -19,7 +23,7 @@
 	cp -a $(OUTPUT) $(INSTALL_DIR)
 
 validate:
-	xmllint --xinclude --noout --postvalid $(MAIN_FILE)
+	$(call xml_validate,$(MAIN_FILE))
 
 $(PACKAGE): $(PACKAGE)/index.html