Commit47b3c26

committed

Have pg_upgrade's Makefile honor NO_TEMP_INSTALL

1 parent696d784 commit47b3c26Copy full SHA for 47b3c26

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,15 @@ OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \`
`14`	`14`	`overrideCPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir)$(CPPFLAGS)`
`15`	`15`	`LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils$(libpq_pgport)`
`16`	`16`
	`17`	`+ifdefNO_TEMP_INSTALL`
	`18`	`+tbindir=$(abs_top_builddir)/tmp_install/$(bindir)`
	`19`	`+tlibdir=$(abs_top_builddir)/tmp_install/$(libdir)`
	`20`	`+DOINST =`
	`21`	`+else`
	`22`	`+tbindir=$(bindir)`
	`23`	`+tlibdir=$(libdir)`
	`24`	`+DOINST = --install`
	`25`	`+endif`
`17`	`26`
`18`	`27`	`all: pg_upgrade`
`19`	`28`
`@@ -37,7 +46,7 @@ clean distclean maintainer-clean:`
`37`	`46`	`pg_upgrade_dump_.custom pg_upgrade_.log`
`38`	`47`
`39`	`48`	`check: test.sh all`
`40`		`-MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)"$(SHELL)$<--install`
	`49`	`+MAKE=$(MAKE) bindir="$(tbindir)" libdir="$(tlibdir)" EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)"$(SHELL)$<$(DOINST)`
`41`	`50`
`42`	`51`	`# installcheck is not supported because there's no meaningful way to test`
`43`	`52`	`# pg_upgrade against a single already-running server`

Comments

(0)