From 88fbe6e85f9039ce35f6a0a30771f562931895e2 Mon Sep 17 00:00:00 2001
From: David Fetter <david@fetter.org>
Date: Tue, 16 Mar 2010 10:26:12 -0700
Subject: [PATCH] Fixed per discussion here:
 http://justatheory.com/computers/databases/postgresql/no_more_use_pgxs.html

---
 Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 1c7c4f8..c3e1e36 100644
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,9 @@ REGRESS = $(patsubst t/sql/%.sql,%,$(TESTS))
 
 EXTRA_CLEAN = 
 
-ifndef NO_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = contrib/plparrot
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
 
 PARROTINCLUDEDIR = $(shell parrot_config includedir)
 PARROTVERSION    = $(shell parrot_config versiondir)