Skip to content

Commit f856fad

Browse files
committed
Adjust postgres.xml rule so that make will notice a failure exit from osx.
The previous coding had it in a pipe, which on most shells won't report the error. Per experimentation with a bug report from Vladimir Kokovic. This doesn't actually fix his problem, but it does explain why make didn't report that there was a problem.
1 parent f5c23ca commit f856fad

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

doc/src/sgml/Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# PostgreSQL documentation makefile
44
#
5-
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.140 2010/04/02 14:02:49 petere Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.141 2010/05/01 18:15:07 tgl Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -223,10 +223,11 @@ regress_README.html: regress.sgml
223223
##
224224

225225
postgres.xml: postgres.sgml $(ALMOSTALLSGML)
226-
$(OSX) -D. -x lower $< | \
227-
$(PERL) -p -e 's/\[(amp|copy|egrave|gt|lt|mdash|nbsp|ouml|pi|quot|uuml) *\]/\&\1;/g;' \
228-
-e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
229-
>$@
226+
$(OSX) -D. -x lower $< >postgres.xmltmp
227+
$(PERL) -p -e 's/\[(amp|copy|egrave|gt|lt|mdash|nbsp|ouml|pi|quot|uuml) *\]/\&\1;/g;' \
228+
-e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
229+
<postgres.xmltmp >$@
230+
rm postgres.xmltmp
230231
# ' hello Emacs
231232

232233
xslthtml: stylesheet.xsl postgres.xml
@@ -354,7 +355,7 @@ clean:
354355
# index
355356
rm -f HTML.index $(GENERATED_SGML)
356357
# XSLT
357-
rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk *.fo
358+
rm -f postgres.xml postgres.xmltmp htmlhelp.hhp toc.hhc index.hhk *.fo
358359
# Texinfo
359360
rm -f *.texixml *.texi *.info db2texi.refs
360361

0 commit comments

Comments
 (0)