rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Dunstan 2019-03-31 08:08:14 -04:00
parent 696d78469f
commit 47b3c26642
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/pg_upgrade/Makefile
View File

@ -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