Install hack workaround for failure of 'make all' in VPATH builds.

tglsfdc · tglsfdc · commit 170456c9d866 · 2010-05-01T21:31:17.000Z
It appears that gmake gets confused if postgres.sgml is not present in
the working directory, and instantiates some default rule or other that
would let postgres.sgml be built from postgres.xml.  I haven't been able
to track down exactly where that's coming from, but the problem can be
dodged by specifying srcdir explicitly in the rule for postgres.xml.
Per report from Vladimir Kokovic.
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.141 2010/05/01 18:15:07 tgl Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.142 2010/05/01 21:31:17 tgl Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -222,7 +222,10 @@ regress_README.html: regress.sgml
 ## XSLT processing
 ##
 
-postgres.xml: postgres.sgml $(ALMOSTALLSGML)
+# For obscure reasons, gmake 3.81 complains about circular dependencies
+# if we try to do "make all" in a VPATH build without the explicit
+# $(srcdir) on the postgres.sgml dependency in this rule.  gmake bug?
+postgres.xml: $(srcdir)/postgres.sgml $(ALMOSTALLSGML)
 	$(OSX) -D. -x lower $< >postgres.xmltmp
 	$(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;' \

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.141 2010/05/01 18:15:07 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.142 2010/05/01 21:31:17 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -222,7 +222,10 @@ regress_README.html: regress.sgml`
`222`	`222`	`## XSLT processing`
`223`	`223`	`##`
`224`	`224`
`225`		`-postgres.xml: postgres.sgml $(ALMOSTALLSGML)`
	`225`	`+# For obscure reasons, gmake 3.81 complains about circular dependencies`
	`226`	`+# if we try to do "make all" in a VPATH build without the explicit`
	`227`	`+# $(srcdir) on the postgres.sgml dependency in this rule. gmake bug?`
	`228`	`+postgres.xml: $(srcdir)/postgres.sgml $(ALMOSTALLSGML)`
`226`	`229`	`$(OSX) -D. -x lower $< >postgres.xmltmp`
`227`	`230`	`$(PERL) -p -e 's/\[(amp\|copy\|egrave\|gt\|lt\|mdash\|nbsp\|ouml\|pi\|quot\|uuml) *\]/\&\1;/g;' \`
`228`	`231`	`-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;' \`