Have pg_upgrade's Makefile honor NO_TEMP_INSTALL

Backpatch to 9.5, when pg_upgrade's location changed.

Discussion: https://postgr.es/m/5506b8fa-7dad-8483-053c-7ca7ef04f01a@2ndQuadrant.com

diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile
index d9c8145ce001ef7f2f074ec3cc4fe044d1efe1d1..1eeac2e7ff12b2920e4969ba0a1f691ecf84843a 100644 (file)
--- a/src/bin/pg_upgrade/Makefile
+++ b/src/bin/pg_upgrade/Makefile
@@ -13,6 +13,15 @@ OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
 
 override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 
+ifdef NO_TEMP_INSTALL
+       tbindir=$(abs_top_builddir)/tmp_install/$(bindir)
+       tlibdir=$(abs_top_builddir)/tmp_install/$(libdir)
+       DOINST =
+else
+       tbindir=$(bindir)
+       tlibdir=$(libdir)
+       DOINST = --install
+endif
 
 all: pg_upgrade
 
@@ -35,7 +44,7 @@ clean distclean maintainer-clean:
               pg_upgrade_dump_*.custom pg_upgrade_*.log
 
 check: test.sh all
-       MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install
+       MAKE=$(MAKE) bindir="$(tbindir)" libdir="$(tlibdir)" EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< $(DOINST)
 
 # disabled because it upsets the build farm
 #installcheck: test.sh