aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in5
-rw-r--r--src/bin/initdb/Makefile2
-rw-r--r--src/bin/pg_basebackup/Makefile2
-rw-r--r--src/bin/pg_config/Makefile2
-rw-r--r--src/bin/pg_controldata/Makefile2
-rw-r--r--src/bin/pg_ctl/Makefile2
-rw-r--r--src/bin/scripts/Makefile2
-rw-r--r--src/interfaces/ecpg/Makefile2
-rw-r--r--src/makefiles/pgxs.mk2
-rw-r--r--src/pl/plperl/GNUmakefile2
-rw-r--r--src/pl/plpython/Makefile2
-rw-r--r--src/pl/tcl/Makefile2
12 files changed, 13 insertions, 14 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 81cae942d9f..a0fe8e43eb9 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -308,10 +308,9 @@ check: temp-install
temp-install:
ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
- $(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
- $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
+ $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install
endif
- $(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 || exit; done)
+ $(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install || exit; done)
PROVE = @PROVE@
PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index fc809a0706d..d4797880dd5 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -58,7 +58,7 @@ clean distclean maintainer-clean:
# ensure that changes in datadir propagate into object file
initdb.o: initdb.c $(top_builddir)/src/Makefile.global
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index 58f8b66494d..0d8421a71e5 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -50,7 +50,7 @@ clean distclean maintainer-clean:
$(OBJS)
rm -rf tmp_check
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 71ce236b9e7..dbc98990fb7 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -49,7 +49,7 @@ clean distclean maintainer-clean:
rm -f pg_config$(X) $(OBJS)
rm -rf tmp_check
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index f7a4010bf80..fd7399ba98f 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -35,7 +35,7 @@ clean distclean maintainer-clean:
rm -f pg_controldata$(X) $(OBJS)
rm -rf tmp_check
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 525e1d4750f..37eb482a5c0 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -38,7 +38,7 @@ clean distclean maintainer-clean:
rm -f pg_ctl$(X) $(OBJS)
rm -rf tmp_check
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 8b6f54ccee8..c8317164f8a 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -69,7 +69,7 @@ clean distclean maintainer-clean:
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
rm -rf tmp_check
-check: all
+check:
$(prove_check)
installcheck:
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index b80de4e2475..41460a17c96 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -26,5 +26,5 @@ install-ecpglib-recurse: install-pgtypeslib-recurse
clean distclean maintainer-clean:
$(MAKE) -C test clean
-check checktcp installcheck: all
+check checktcp installcheck:
$(MAKE) -C test $@
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 08e25da7231..b5113726841 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -291,7 +291,7 @@ check:
@echo '"$(MAKE) check" is not supported.'
@echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.'
else
-check: all submake $(REGRESS_PREP)
+check: submake $(REGRESS_PREP)
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
temp-install: EXTRA_INSTALL+=$(subdir)
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index cebffde79d7..904a320cf6a 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -114,7 +114,7 @@ uninstall-data:
.PHONY: install-data uninstall-data
-check: all submake
+check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index e70e285611d..de97cbb780b 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -141,7 +141,7 @@ uninstall-data:
include $(srcdir)/regress-python3-mangle.mk
-check: all submake
+check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 851e3c063f5..533d3b4efd0 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -92,7 +92,7 @@ uninstall-data:
.PHONY: install-data uninstall-data
-check: all submake
+check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake