No problem; here's the updated patch. :-)

I still use setenv for XML_CATALOG_FILES; is there a more correct way?
(It's not a Make variable; it's for xmllint(1).)