Commit f856fad8 authored by Tom Lane's avatar Tom Lane

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.
parent f5c23ca2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# PostgreSQL documentation makefile # PostgreSQL documentation makefile
# #
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.140 2010/04/02 14:02:49 petere Exp $ # $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.141 2010/05/01 18:15:07 tgl Exp $
# #
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
...@@ -223,10 +223,11 @@ regress_README.html: regress.sgml ...@@ -223,10 +223,11 @@ regress_README.html: regress.sgml
## ##
postgres.xml: postgres.sgml $(ALMOSTALLSGML) postgres.xml: postgres.sgml $(ALMOSTALLSGML)
$(OSX) -D. -x lower $< | \ $(OSX) -D. -x lower $< >postgres.xmltmp
$(PERL) -p -e 's/\[(amp|copy|egrave|gt|lt|mdash|nbsp|ouml|pi|quot|uuml) *\]/\&\1;/g;' \ $(PERL) -p -e 's/\[(amp|copy|egrave|gt|lt|mdash|nbsp|ouml|pi|quot|uuml) *\]/\&\1;/g;' \
-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;' \ -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;' \
>$@ <postgres.xmltmp >$@
rm postgres.xmltmp
# ' hello Emacs # ' hello Emacs
xslthtml: stylesheet.xsl postgres.xml xslthtml: stylesheet.xsl postgres.xml
...@@ -354,7 +355,7 @@ clean: ...@@ -354,7 +355,7 @@ clean:
# index # index
rm -f HTML.index $(GENERATED_SGML) rm -f HTML.index $(GENERATED_SGML)
# XSLT # XSLT
rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk *.fo rm -f postgres.xml postgres.xmltmp htmlhelp.hhp toc.hhc index.hhk *.fo
# Texinfo # Texinfo
rm -f *.texixml *.texi *.info db2texi.refs rm -f *.texixml *.texi *.info db2texi.refs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment