Make it possible to run 'make installcheck' in contrib when building

outside the source tree.

diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk
index 3e1e99a5b2f848bd291ff89bff4d2875e5baad27..a93c75900c9bcd0f8d94f6a92ba6a6e074529371 100644 (file)
--- a/contrib/contrib-global.mk
+++ b/contrib/contrib-global.mk
@@ -185,6 +185,24 @@ distclean maintainer-clean: clean
 
 
 ifdef REGRESS
+
+# When doing a VPATH build, must copy over the test .sql and .out
+# files so that the driver script can find them.  We have to use an
+# absolute path for the targets, because otherwise make will try to
+# locate the missing files using VPATH, and will find them in
+# $(srcdir), but the point here is that we want to copy them from
+# $(srcdir) to the build directory.
+
+ifdef VPATH
+abs_builddir := $(shell pwd)
+test_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out) $(wildcard $(srcdir)/data/*.data)
+test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src))
+
+all: $(test_files_build)
+$(test_files_build): $(abs_builddir)/%: $(srcdir)/%
+       ln -s $< $@
+endif # VPATH
+
 .PHONY: submake
 submake:
        $(MAKE) -C $(top_builddir)/src/test/regress pg_regress