diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-11 17:39:30 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-11 17:39:46 -0500 |
| commit | f285f23970dee5ab9ac67a415a41a3a19010be87 (patch) | |
| tree | bcbe9749b4e6144cb94a3c75a9b26c6ab40c0407 | |
| parent | 89d52b9a3e3fab3d6876c997370684a8b1c77f3b (diff) | |
| download | postgresql-f285f23970dee5ab9ac67a415a41a3a19010be87.tar.gz postgresql-f285f23970dee5ab9ac67a415a41a3a19010be87.zip | |
Fix up confusion over how to use EXTRA_INSTALL.
Some makefiles were trying to do this:
temp-install: EXTRA_INSTALL=contrib/test_decoding
but that no longer works as of commit aa019da52: the macro is now
consulted by the checkprep target, one level down, and apparently
gmake doesn't propagate such macro settings recursively.
The problem is masked since 42e61c774 because pgxs.mk also sets up
EXTRA_INSTALL, and correctly applies it to the checkprep target.
Unfortunately I'd not risked back-patching that to before v11.
Since aa019da52 was pushed back to v10, it broke test_decoding
there (the only module for which this actually makes a difference
at present).
Hence, back-patch 42e61c774 to v10. Also, remove some demonstrably
useless settings of EXTRA_INSTALL in v10 and v11 (they'd already
been cleaned up in HEAD).
Per buildfarm.
Discussion: https://postgr.es/m/CAEepm=1pEJdwv6DSGmOfpX0EaX7L7sT28c1nXpqvQvmLfEWb1g@mail.gmail.com
| -rw-r--r-- | contrib/test_decoding/Makefile | 2 | ||||
| -rw-r--r-- | src/test/modules/snapshot_too_old/Makefile | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile index afcab930f7a..a5f9b81a820 100644 --- a/contrib/test_decoding/Makefile +++ b/contrib/test_decoding/Makefile @@ -65,5 +65,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_decoding temp .PHONY: submake-test_decoding submake-regress check \ regresscheck regresscheck-install-force \ isolationcheck isolationcheck-install-force - -temp-install: EXTRA_INSTALL=contrib/test_decoding diff --git a/src/test/modules/snapshot_too_old/Makefile b/src/test/modules/snapshot_too_old/Makefile index b6d998f3207..05222e2b91a 100644 --- a/src/test/modules/snapshot_too_old/Makefile +++ b/src/test/modules/snapshot_too_old/Makefile @@ -43,5 +43,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_snapshot_too_ $(ISOLATIONCHECKS) .PHONY: check submake-test_snapshot_too_old isolationcheck isolationcheck-install-force - -temp-install: EXTRA_INSTALL=src/test/modules/snapshot_too_old |