mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-31 12:37:24 +02:00
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:
parent
d70c147fa2
commit
4d6bd92db5
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user