From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Tue, 1 Oct 2013 20:36:15 +0000 (-0300)
Subject: Remove broken PGXS code for pg_xlogdump
X-Git-Tag: REL9_3_1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecce2618a9c8aba46272d77412dfe02a9224ea69;p=postgresql

Remove broken PGXS code for pg_xlogdump

With the PGXS boilerplate in place, pg_xlogdump currently fails with an
ominous error message that certain targets cannot be built because
certain files do not exist.  Remove that and instead throw a quick error
message alerting the user of the actual problem, which should be easier
to diagnose that the statu quo.

Andres Freund
---

diff --git a/contrib/pg_xlogdump/Makefile b/contrib/pg_xlogdump/Makefile
index 22bd8dc35a..ada261c4dd 100644
--- a/contrib/pg_xlogdump/Makefile
+++ b/contrib/pg_xlogdump/Makefile
@@ -13,15 +13,14 @@ RMGRDESCOBJS = $(patsubst %.c,%.o,$(RMGRDESCSOURCES))
 EXTRA_CLEAN = $(RMGRDESCSOURCES) xlogreader.c
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
+$(error "pg_xlogdump cannot be built with PGXS")
+endif
+
 subdir = contrib/pg_xlogdump
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
-endif
+
 
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)