Put back the copying of some of the regression test data files for vpath

builds.  It is too complicated to fix in another way for now.

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 61fa05b413ba8f0be8bc4010aa7272c8d66d389d..bdc92a866835488eed0bd003e521644bef80f59c 100644 (file)
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -1,6 +1,6 @@
 # PGXS: PostgreSQL extensions makefile
 
-# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.14 2008/10/02 12:25:25 tgl Exp $ 
+# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.15 2008/10/03 08:00:16 petere Exp $ 
 
 # This file contains generic rules to build many kinds of simple
 # extension modules.  You only need to set a few variables and include
@@ -232,6 +232,23 @@ endif
 # where to find psql for running the tests
 PSQLDIR = $(bindir)
 
+# When doing a VPATH build, must copy over the data 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)/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:
 ifndef PGXS