@@ -155,12 +155,13 @@ XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'
155155% -US.fo% -full.xml
156156$(XSLTPROC ) $(XMLINCLUDE ) $(XSLTPROCFLAGS ) $(XSLTPROC_FO_FLAGS ) --stringparam paper.type USletter -o$@ $^
157157
158+ # There is no easy way to pipe output and capture its return code,
159+ # so add a final line to report the return code.
158160% .pdf% .fo$(ALL_IMAGES )
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) < -pdf$@ 2>&1 ; [" $$ ?" -ne 0 ]&& echo " FOP_ERROR" ; }| \
161- $(AWK ) ' BEGIN { warn = 0 } ! /^FOP_ERROR$$/ { print } /not available in font/ { warn = 1 } \
161+ { LANG=C$( FOP) < -pdf$@ 2>&1 ; echo " FOP_RETURN$$ ?" ; }| \
162+ $(AWK ) ' BEGIN { warn = 0 } $$1 != "FOP_RETURN" { print } /not available in font/ { warn = 1 } \
162163END {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
164+ if ($$ 2 ! = 0 ) {exit $$ 2 } }' 1>&2
164165
165166
166167# #