diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2019-03-31 08:08:14 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2019-03-31 08:22:04 -0400 |
| commit | d02abc2e966ba47c62c8909f8e96018b4a7ccb5a (patch) | |
| tree | ae6b6b6825e497b24c8d775916c77b0c013b20dc /src | |
| parent | 0a5dcb87aec72ee90e21fb0ad05988ec54211dc3 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index e3a0cd702dd..c97b2728c60 100644 --- a/src/bin/pg_upgrade/Makefile +++ b/src/bin/pg_upgrade/Makefile @@ -14,6 +14,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) LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) +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 @@ -36,7 +45,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 |