From: Mark Wielaard <mark@klomp.org>
Date: Sun, 9 Mar 2025 15:46:50 +0000 (+0100)
Subject: docs/Makefile.am: Make sure xml catalog file exists for xmllint check
X-Git-Tag: VALGRIND_3_25_0~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f956db3e5eb0afb0d60987f3658b66646a0ac81;p=thirdparty%2Fvalgrind.git

docs/Makefile.am: Make sure xml catalog file exists for xmllint check

When XML_CATALOG_FILES don't exist on the system xmllint will have to
query those files through various websites. When there is a network
error xmllint will fail. So make sure to only run the validity tests
when both xmllint and XML_CATALOG_FILES exists.
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 12d13db1d..68a3da561 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -186,14 +186,20 @@ all-docs: FAQ.txt man-pages html-docs print-docs
 
 valid-manual: $(MANUAL_XML_FILES)
 	if type $(XMLLINT) 2>/dev/null; then \
-	  $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/index.xml && \
-	  touch $@; \
+	  if [ -f $(XML_CATALOG_FILES) ]; then \
+	    export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
+	    $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/index.xml && \
+	    touch $@; \
+	  fi \
 	fi
 
 valid-manpages: $(MANPAGES_XML_FILES)
 	if type $(XMLLINT) 2>/dev/null; then \
-	  $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/manpages-index.xml && \
-	  touch $@; \
+	  if [ -f $(XML_CATALOG_FILES) ]; then \
+	    export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
+	    $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/manpages-index.xml && \
+	    touch $@; \
+	  fi \
 	fi
 
 check-local: valid-manual valid-manpages