diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2020-05-31 18:33:00 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2020-05-31 18:35:21 -0400 |
| commit | f4f4d64eafcd07880fee570e367422af757d3f02 (patch) | |
| tree | 83d0f3bfe212a42b63b18d6709bd3cf3b8dce17a | |
| parent | c001c115bcb2accddc23a25c605886e01475db4f (diff) | |
| download | postgresql-f4f4d64eafcd07880fee570e367422af757d3f02.tar.gz postgresql-f4f4d64eafcd07880fee570e367422af757d3f02.zip | |
Make install-tests target work with vpath builds
Also add a top-level install-tests target.
Backpatch to all live branches.
Craig Ringer, tweaked by me.
| -rw-r--r-- | GNUmakefile.in | 1 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index af04ed9f2f6..31e2efed8d4 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -72,6 +72,7 @@ $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,c $(call recurse,checkprep, src/test src/pl src/interfaces/ecpg contrib src/bin) $(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib src/bin,installcheck) +$(call recurse,install-tests,src/test/regress,install-tests) GNUmakefile: GNUmakefile.in $(top_builddir)/config.status ./config.status $@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 378bd017530..82c6633b15a 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -87,8 +87,8 @@ regress_data_files = \ install-tests: all install install-lib installdirs-tests $(MAKE) -C $(top_builddir)/contrib/spi install - for file in $(regress_data_files); do \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(pkglibdir)/regress/'$$file || exit; \ + for file in $(subst $(srcdir)/,,$(regress_data_files)); do \ + $(INSTALL_DATA) $(srcdir)/$$file '$(DESTDIR)$(pkglibdir)/regress/'$$file || exit; \ done installdirs-tests: installdirs |