Merge remote-tracking branch 'origin/master' into release_2_5

This commit is contained in:
Mikhail A. Kulagin
2021-10-18 15:41:43 +03:00
86 changed files with 3946 additions and 36 deletions
+7
View File
@@ -1,4 +1,7 @@
PROGRAM = pg_probackup
WORKDIR ?= $(CURDIR)
BUILDDIR = $(WORKDIR)/build/
PBK_GIT_REPO = https://github.com/postgrespro/pg_probackup
# utils
OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
@@ -80,3 +83,7 @@ src/walmethods.h: $(srchome)/src/bin/pg_basebackup/walmethods.h
ifeq ($(PORTNAME), aix)
CC=xlc_r
endif
include packaging/Makefile.pkg
include packaging/Makefile.repo
include packaging/Makefile.test