Include contrib modules in the temp installation even without REGRESS.

tglsfdc · tglsfdc · commit 42e61c7748eb · 2018-08-28T17:26:09.000-04:00
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
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
@@ -359,10 +359,12 @@ check:
 else
 check: submake $(REGRESS_PREP)
 	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
+endif
+endif # REGRESS
 
+ifndef NO_TEMP_INSTALL
 temp-install: EXTRA_INSTALL+=$(subdir)
 endif
-endif # REGRESS
 
 
 # STANDARD RULES
