aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2022-07-22 20:15:11 +0200
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2022-07-22 20:15:11 +0200
commit0f39b70a6f3664036d527fb04ba709d363072a2e (patch)
treee7e26073f4232a1d8ef906c0fa3ff909d793d244
parent83011ce7d7f42b744a93d2b0819597d0aa94e9cc (diff)
downloadpostgresql-0f39b70a6f3664036d527fb04ba709d363072a2e.tar.gz
postgresql-0f39b70a6f3664036d527fb04ba709d363072a2e.zip
Fix [install]check in interfaces/libpq/Makefile
The common recipe when TAP tests are disabled doesn't work, because the libpq-specific recipe wants to define the PATH environment variable, so the starting '@' is misinterpreted as part of the command instead of silencing said command. Fix by setting the environment variable in a way that doesn't interfere with the recipe. Reported-by: Justin Pryzby <pryzby@telsasoft.com> Discussion: https://postgr.es/m/20220720172321.GL12702@telsasoft.com
-rw-r--r--src/interfaces/libpq/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index b5fd72a4acf..8abdb092c20 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -143,11 +143,13 @@ install: all installdirs install-lib
test-build:
$(MAKE) -C test all
+check installcheck: export PATH := $(CURDIR)/test:$(PATH)
+
check: test-build all
- PATH="$(CURDIR)/test:$$PATH" && $(prove_check)
+ $(prove_check)
installcheck: test-build all
- PATH="$(CURDIR)/test:$$PATH" && $(prove_installcheck)
+ $(prove_installcheck)
installdirs: installdirs-lib
$(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' '$(DESTDIR)$(datadir)'