--- a/Makefile	Thu Jan 26 16:51:15 2006 -0500
+++ b/Makefile	Thu Jan 26 16:51:38 2006 -0500
@@ -11,9 +11,7 @@
 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):/'
+xml_validate=xmllint --xinclude --postvalid --noout $(1)
 html_validate=true
 
 all: $(OUTPUT)
@@ -22,9 +20,12 @@
 	mkdir -p $(INSTALL_DIR)
 	cp -a $(OUTPUT) $(INSTALL_DIR)
 
-validate:
+validate: $(addsuffix -validate,$(DEPENDS))
 	$(call xml_validate,$(MAIN_FILE))
 
+$(addsuffix -validate,$(DEPENDS)):
+	$(call xml_validate,$(subst -validate,,$@))
+
 $(PACKAGE): $(PACKAGE)/index.html
 
 $(PACKAGE).fo: $(DEPENDS)