aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2015-09-28 10:47:05 -0400
committerRobert Haas <rhaas@postgresql.org>2015-09-28 10:49:59 -0400
commit45e5b4ef5c392ddfcd72693f65659bafdda7ee1b (patch)
treee63592856f21d63e550cca67caa1bf858e9e0fc2 /src
parent883af819c1ef7ec975f5c180a3434ff690c23606 (diff)
downloadpostgresql-45e5b4ef5c392ddfcd72693f65659bafdda7ee1b.tar.gz
postgresql-45e5b4ef5c392ddfcd72693f65659bafdda7ee1b.zip
Don't try to create a temp install without abs_top_builddir.
Otherwise, we effectively act as if abs_top_builddir were the root directory, which is quite dangerous if the user happens to have permissions to do things there. This can crop up in PGXS builds, for example. Report by Sandro Santilli, patch by me, review by Noah Misch.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 6871c3c6143..74ffcbf2f14 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -320,6 +320,7 @@ check: temp-install
.PHONY: temp-install
temp-install:
ifndef NO_TEMP_INSTALL
+ifneq ($(abs_top_builddir),)
ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
@@ -327,6 +328,7 @@ ifeq ($(MAKELEVEL),0)
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 || exit; done)
endif
+endif
PROVE = @PROVE@
PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/