Commit1610fcc

committed

Some marginal tweaks to make 'make installcheck' mostly work when

building contrib with USE_PGXS. To make it work all the way, thepg_regress script would need to be included in the installation tree.

1 parent4fc935a commit1610fccCopy full SHA for 1610fcc

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.9 2005/05/17 18:26:22 tgl Exp $`
	`1`	`+# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.10 2005/09/27 17:43:31 tgl Exp $`
`2`	`2`
`3`	`3`	`NO_PGXS = 1`
`4`		`-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)`
`5`	`4`	`include$(top_srcdir)/src/makefiles/pgxs.mk`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# PGXS: PostgreSQL extensions makefile`
`2`	`2`
`3`		`-# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.5 2005/08/12 21:02:25 momjian Exp $`
	`3`	`+# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.6 2005/09/27 17:43:31 tgl Exp $`
`4`	`4`
`5`	`5`	`# This file contains generic rules to build many kinds of simple`
`6`	`6`	`# extension modules. You only need to set a few variables and include`
`@@ -205,6 +205,11 @@ distclean maintainer-clean: clean`
`205`	`205`
`206`	`206`	`ifdefREGRESS`
`207`	`207`
	`208`	`+# Calling makefile can set REGRESS_OPTS, but this is the default:`
	`209`	`+ifndefREGRESS_OPTS`
	`210`	`+REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)`
	`211`	`+endif`
	`212`	`+`
`208`	`213`	`# When doing a VPATH build, must copy over the test .sql and .out`
`209`	`214`	`# files so that the driver script can find them. We have to use an`
`210`	`215`	`# absolute path for the targets, because otherwise make will try to`
`@@ -224,7 +229,9 @@ endif # VPATH`
`224`	`229`
`225`	`230`	`.PHONY: submake`
`226`	`231`	`submake:`
	`232`	`+ifndefPGXS`
`227`	`233`	`$(MAKE) -C $(top_builddir)/src/test/regress pg_regress`
	`234`	`+endif`
`228`	`235`
`229`	`236`	`# against installed postmaster`
`230`	`237`	`installcheck: submake`

Comments

(0)