Have man page generation work on VPATH builds too.

alvherre · alvherre · commit 2bb4d09cac22 · 2008-08-25T15:34:05.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.106 2008/06/10 00:19:32 alvherre Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.107 2008/08/25 15:34:05 alvherre Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -66,9 +66,9 @@ DEFAULTSECTION = $(sqlmansect_dummy)
 fix_man_xrefs = $(PERL) -npi -e 's{\[XRef to GUC-([A-Z0-9-]*)\]}{($$l = $$1) =~ tr/A-Z-/a-z_/, $$l}ge || s{\[XRef to [A-Z0-9-]*\]}{in the documentation}g'
 
 man: postgres.sgml $(ALLSGML)
-	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
+	$(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
 # One more time, to resolve cross-references
-	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
+	$(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
 	$(fix_man_xrefs) *.1 *.$(DEFAULTSECTION)
 	$(mkinstalldirs) man1 man$(DEFAULTSECTION)
 	mv *.1 man1/

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.106 2008/06/10 00:19:32 alvherre Exp $`
	`5`	`+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.107 2008/08/25 15:34:05 alvherre Exp $`
`6`	`6`	`#`
`7`	`7`	`#----------------------------------------------------------------------------`
`8`	`8`
`@@ -66,9 +66,9 @@ DEFAULTSECTION = $(sqlmansect_dummy)`
`66`	`66`	`fix_man_xrefs = $(PERL) -npi -e 's{\[XRef to GUC-([A-Z0-9-])\]}{($$l = $$1) =~ tr/A-Z-/a-z_/, $$l}ge \|\| s{\[XRef to [A-Z0-9-]\]}{in the documentation}g'`
`67`	`67`
`68`	`68`	`man: postgres.sgml $(ALLSGML)`
`69`		- $(NSGMLS) $(NSGMLS_FLAGS) $< \| $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
	`69`	+ $(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< \| $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
`70`	`70`	`# One more time, to resolve cross-references`
`71`		- $(NSGMLS) $(NSGMLS_FLAGS) $< \| $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
	`71`	+ $(NSGMLS) $(NSGMLS_FLAGS) $(SGMLINCLUDE) $< \| $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
`72`	`72`	`$(fix_man_xrefs) .1 .$(DEFAULTSECTION)`
`73`	`73`	`$(mkinstalldirs) man1 man$(DEFAULTSECTION)`
`74`	`74`	`mv *.1 man1/`