Merge commit '4211fd833120b013f8f54c7ce68236623ad7e510' into PGPRO9_6

dmpgpro · dmpgpro · commit e85c5b0cd9e7 · 2016-09-13T15:40:57.000+03:00
diff --git a/contrib/pg_arman/Makefile b/contrib/pg_arman/Makefile
@@ -23,14 +23,35 @@ OBJS = backup.o \
 
 EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h streamutil.c streamutil.h logging.h
 
-PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
-override CPPFLAGS := -DFRONTEND $(CPPFLAGS) 
-PG_LIBS = $(libpq_pgport) ${PTHREAD_LIBS} ${PTHREAD_CFLAGS}
-
 REGRESS = init option show delete backup restore
 
 all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_arman
 
+MAKE_GLOBAL="../../src/Makefile.global"
+TEST_GLOBAL:=$(shell test -e ../../src/Makefile.global)
+ifeq ($(.SHELLSTATUS),1)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+
+.PHONY: checksrcdir
+checksrcdir:
+ifndef top_srcdir
+	@echo "You must have PostgreSQL source tree available to compile."
+	@echo "Pass the path to the PostgreSQL source tree to make, in the top_srcdir"
+	@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
+	@exit 1
+endif
+else
+subdir=contrib/pg_arman
+top_builddir=../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
+override CPPFLAGS := -DFRONTEND $(CPPFLAGS) $(PG_CPPFLAGS)
+PG_LIBS = $(libpq_pgport) ${PTHREAD_CFLAGS}
+
 # This rule's only purpose is to give the user instructions on how to pass
 # the path to PostgreSQL source tree to the makefile.
 .PHONY: checksrcdir
@@ -61,8 +82,3 @@ streamutil.c: % : $(top_srcdir)/src/bin/pg_basebackup/%
 	rm -f  && $(LN_S) $< .
 streamutil.h: % : $(top_srcdir)/src/bin/pg_basebackup/%
 	rm -f  && $(LN_S) $< .
-
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-
