summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2013-10-01 17:36:15 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2013-10-01 17:39:46 -0300
commitecce2618a9c8aba46272d77412dfe02a9224ea69 (patch)
tree2bbdcc783275a63bf610df70d2efe2dc3eda958a
parentd794eae6135b3bb43b54498e95253aa43d776905 (diff)
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
-rw-r--r--contrib/pg_xlogdump/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/pg_xlogdump/Makefile b/contrib/pg_xlogdump/Makefile
index 22bd8dc35a2..ada261c4dd0 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)