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:19:05 -0400 |
| commit | 47b3c26642e6850e8dfa7afe01db78320b11549e (patch) | |
| tree | d734b67836af83c1c1ab8e4325e7d60d87af6d48 | |
| parent | 696d78469f3714a8159f7a145af1fe9179fe3291 (diff) | |
| download | postgresql-47b3c26642e6850e8dfa7afe01db78320b11549e.tar.gz postgresql-47b3c26642e6850e8dfa7afe01db78320b11549e.zip | |
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
| -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 adb0d5d707a..5a189484251 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 @@ -37,7 +46,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) # installcheck is not supported because there's no meaningful way to test # pg_upgrade against a single already-running server |