From 8ede2691d65e4c0aa1ae23453b5bed63f9a36254 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 28 Aug 2018 17:26:09 -0400 Subject: [PATCH] Include contrib modules in the temp installation even without REGRESS. Now that we have TAP tests, a contrib module may have something useful to do in "make check" even if it has no pg_regress-style regression scripts, and hence no REGRESS setting. But the TAP tests will fail, or else test the wrong installed files, unless we install the contrib module into the temp installation. So move the bit about adding to EXTRA_INSTALL so that it applies regardless. We might want this in back branches in future, but for the moment I only risked adding it to v11. Discussion: https://postgr.es/m/12438.1535488750@sss.pgh.pa.us --- src/makefiles/pgxs.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 158581b3f5..8deb356958 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -359,11 +359,13 @@ check: else check: submake $(REGRESS_PREP) $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) - -temp-install: EXTRA_INSTALL+=$(subdir) endif endif # REGRESS +ifndef NO_TEMP_INSTALL +temp-install: EXTRA_INSTALL+=$(subdir) +endif + # STANDARD RULES