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:23 -0400 |
| commit | 7582251c1056ec657b9d32f547b8f661c6375e78 (patch) | |
| tree | 69be7a83e50760cd6d5879b5b690cb628938fb7c /src/bin | |
| parent | 261aa218c9a0fcd93f6a27ca014c9d1ee278fa8b (diff) | |
| download | postgresql-7582251c1056ec657b9d32f547b8f661c6375e78.tar.gz postgresql-7582251c1056ec657b9d32f547b8f661c6375e78.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
Diffstat (limited to 'src/bin')
| -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 d9c8145ce00..1eeac2e7ff1 100644 --- 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 |