Skip to content

Commit a6450de

Browse files
committed
Merge commit 'f49bf7d73cfdfd1bb2f1503f10f8be58ece23b24' into dev/pglogical
2 parents 9cc9bd7 + f49bf7d commit a6450de

File tree

4 files changed

+4
-230
lines changed

4 files changed

+4
-230
lines changed

contrib/pglogical/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OBJS = pglogical_apply.o pglogical_conflict.o pglogical_manager.o \
1212
pglogical_functions.o pglogical_queue.o pglogical_fe.o \
1313
pglogical_worker.o pglogical_hooks.o pglogical_sync.o
1414

15-
PG_CPPFLAGS = -I$(libpq_srcdir)
15+
PG_CPPFLAGS = -I$(libpq_srcdir) -I$(top_srcdir)/contrib/pglogical_output
1616
SHLIB_LINK = $(libpq)
1717

1818
REGRESS = preseed infofuncs init_fail init preseed_check basic extended toasted replication_set add_table matview bidirectional primary_key foreign_key functions copy drop
@@ -27,9 +27,7 @@ include $(top_srcdir)/contrib/contrib-global.mk
2727
# typical installcheck users do not have (e.g. buildfarm clients).
2828
@installcheck: ;
2929

30-
EXTRA_INSTALL += $(top_srcdir)/contrib/pglogical_output
31-
EXTRA_REGRESS_OPTS += $(top_srcdir)/contrib/pglogical/regress-postgresql.conf
32-
33-
override CPPFLAGS := $(CPPFLAGS) -I$(top_srcdir)/contrib/pglogical_output
30+
EXTRA_INSTALL += contrib/pglogical_output
31+
EXTRA_REGRESS_OPTS += --temp-config $(top_srcdir)/contrib/pglogical/regress-postgresql.conf
3432

3533
.PHONY: pglogical_create_subscriber

contrib/pglogical/pglogical--1.0.0--1.0.1.sql

Lines changed: 0 additions & 21 deletions
This file was deleted.

contrib/pglogical/pglogical--1.0.0.sql

Lines changed: 0 additions & 203 deletions
This file was deleted.

contrib/pglogical/pglogical.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pglogical extension
22
comment = 'PostgreSQL Logical Replication'
3-
default_version = '1.0.0'
3+
default_version = '1.0.1'
44
module_pathname = '$libdir/pglogical'
55
relocatable = false
66
schema = pglogical

0 commit comments

Comments
 (0)