Merge branch 'PGPROEE9_6_MULTIMASTER' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_MULTIMASTER

knizhnik · knizhnik · commit def159bde07f · 2017-03-23T18:59:22.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -1,14 +1,8 @@
-MODULE_big = multimaster
-OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o
 
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
-
-.PHONY: all
-
-EXTRA_INSTALL=contrib/mmts
-
-all: multimaster.so
+OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o
+MODULE_big = multimaster
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK = $(libpq)
@@ -18,11 +12,18 @@ PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
-subdir = contrib/multimaster
+subdir = contrib/mmts
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+.PHONY: all
+
+EXTRA_INSTALL=contrib/mmts
+
+all: multimaster.so
+
+
 
 check: temp-install
 	$(prove_check)
