Return actual error code from FOP failure in PDF build

bmomjian · bmomjian · commit 24c1c6338719 · 2024-12-04T14:37:24.000-05:00
Previously we returned "1" on error. Improvement on 77c189c. Backpatch-through: master
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
@@ -155,12 +155,13 @@ XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'
 %-US.fo: stylesheet-fo.xsl %-full.xml
 	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type USletter -o $@ $^
 
+# There is no easy way to pipe output and capture its return code,
+# so add a final line to report the return code.
 %.pdf: %.fo $(ALL_IMAGES)
-	@# There is no easy way to pipe output and capture its return code, so output a special string on failure.
-	{ LANG=C $(FOP) -fo $< -pdf $@ 2>&1; [ "$$?" -ne 0 ] && echo "FOP_ERROR"; } | \
-	$(AWK) 'BEGIN { warn = 0 }  ! /^FOP_ERROR$$/ { print }  /not available in font/ { warn = 1 }  \
+	{ LANG=C $(FOP) -fo $< -pdf $@ 2>&1; echo "FOP_RETURN $$?"; } | \
+	$(AWK) 'BEGIN { warn = 0 }  $$1 != "FOP_RETURN" { print }  /not available in font/ { warn = 1 }  \
 	END { if (warn != 0) print("\nFound characters that cannot be output in the PDF document;  see README.non-ASCII"); \
-	if ($$0 ~ /^FOP_ERROR$$/) { exit 1} }' 1>&2
+	if ($$2 != 0) { exit $$2} }' 1>&2
 
 
 ##
