From 856244fdd60a148fdaf0f37c4397cb0945e1964c Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Tue, 18 Apr 2017 12:25:25 +0900 Subject: [PATCH] Suffix binaries with "4" ("repmgr4" etc) So we can use the existing repmgr in parallel for development --- .gitignore | 4 ++++ Makefile.in | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5a93f1d8..314cdaa3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,7 @@ lib*.pc # other /.lineno + +# generated binaries +repmgr4 +repmgrd4 diff --git a/Makefile.in b/Makefile.in index f0f986ce..99c3d653 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,7 +10,7 @@ MODULE_big = repmgr EXTENSION = repmgr # Hacky workaround to install the binaries -SCRIPTS_built = repmgr +SCRIPTS_built = repmgr4 repmgrd4 # When in development add -Werror @@ -25,10 +25,14 @@ include Makefile.global $(info Building against PostgreSQL $(MAJORVERSION)) REPMGR_CLIENT_OBJS = repmgr-client.o +REPMGRD_OBJS = repmgrd.o -repmgr: $(REPMGR_CLIENT_OBJS) +repmgr4: $(REPMGR_CLIENT_OBJS) $(CC) $(CFLAGS) $(REPMGR_CLIENT_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) +repmgrd4: $(REPMGRD_OBJS) + $(CC) $(CFLAGS) $(REPMGRD_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) + # Ensure Makefiles are up-to-date (should we move this to Makefile.global?) Makefile: Makefile.in config.status configure @@ -43,6 +47,7 @@ maintainer-clean: additional-maintainer-clean additional-clean: rm -f repmgr-client.o + rm -f repmgrd.o maintainer-additional-clean: clean rm -f configure