Make XML building work silently on VPATH builds (untested on regular builds).

alvherre · alvherre · commit 96063da99df7 · 2008-06-10T00:19:32.000Z
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.105 2007/12/15 10:28:21 momjian Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.106 2008/06/10 00:19:32 alvherre Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -224,7 +224,7 @@ OSX = osx # (may be called sx or sgml2xml on some systems)
 XSLTPROC = xsltproc
 
 postgres.xml: postgres.sgml $(GENERATED_SGML)
-	$(OSX) -x lower $< | \
+	$(OSX) -D. -x lower $< | \
 	  sed -e 's/\[\(amp\|copy\|egrave\|gt\|lt\|mdash\|nbsp\|ouml\|pi\|quot\|uuml\) *\]/\&\1;/g' \
 	      -e '1a\' -e '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' \
 	  >$@

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# PostgreSQL documentation makefile`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.105 2007/12/15 10:28:21 momjian Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.106 2008/06/10 00:19:32 alvherre Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -224,7 +224,7 @@ OSX = osx # (may be called sx or sgml2xml on some systems)`
`224`	`224`	`XSLTPROC = xsltproc`
`225`	`225`
`226`	`226`	`postgres.xml: postgres.sgml $(GENERATED_SGML)`
`227`		`- $(OSX) -x lower $< \| \`
	`227`	`+ $(OSX) -D. -x lower $< \| \`
`228`	`228`	`sed -e 's/\[\(amp\\|copy\\|egrave\\|gt\\|lt\\|mdash\\|nbsp\\|ouml\\|pi\\|quot\\|uuml\) *\]/\&\1;/g' \`
`229`	`229`	`-e '1a\' -e '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' \`
`230`	`230`	`>$@`