Commit498f130

committed

Fix Makefile so invalid characters warning preserves error code

Fix for commite4c8865.Reported-by: Peter EisentrautDiscussion:https://postgr.es/m/88cb6ecf-22bb-431e-974b-1cd236a80364@eisentraut.orgBackpatch-through: master

1 parent8b318a1 commit498f130Copy full SHA for 498f130

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,11 @@ XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'`
`156`	`156`	`$(XSLTPROC)$(XMLINCLUDE)$(XSLTPROCFLAGS)$(XSLTPROC_FO_FLAGS) --stringparam paper.type USletter -o$@$^`
`157`	`157`
`158`	`158`	`%.pdf:%.fo$(ALL_IMAGES)`
`159`		`-LANG=C$(FOP) -fo$< -pdf$@2>&1\|\`
`160`		`-awk'BEGIN { warn = 0 } { print } /not available in font/ { warn = 1 } \`
`161`		`-END {if (warn!= 0) print("\nFound characters that cannot be output in the PDF document; see README.non-ASCII") }' 1>&2`
	`159`	`+@# There is no easy way to pipe output and capture its return code, so output a special string on failure.`
	`160`	`+{ LANG=C$(FOP) -fo $< -pdf$@2>&1; ["$$?"-ne 0 ]&&echo"FOP_ERROR"; }\|\`
	`161`	`+awk'BEGIN { warn = 0 } ! /^FOP_ERROR$$/ { print } /not available in font/ { warn = 1 } \`
	`162`	`+END {if (warn!= 0) print("\nFound characters that cannot be output in the PDF document; see README.non-ASCII"); \`
	`163`	`+if ($$0~ /^FOP_ERROR$$/) {exit 1} }' 1>&2`
`162`	`164`
`163`	`165`
`164`	`166`	`##`

Comments

(0)