From 0d7db2fdcd1f2b797a0c57882b2ee7080df376e5 Mon Sep 17 00:00:00 2001
From: Emiel van de Laar <emiel@vandelaar.name>
Date: Tue, 2 Oct 2012 22:09:09 +0200
Subject: [PATCH] Fix support for '--with-python=PYTHON' configure flag

---
 doc/Makefile       | 4 ++--
 sql/Makefile       | 1 +
 sql/common-pgxs.mk | 4 ++--
 upgrade/Makefile   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 1baffd2e..8b7de2ec 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -35,8 +35,8 @@ FQMAN = $(FQMAN1) $(FQMAN1_SFX) $(FQMAN5)
 
 COMMON = common.switches.txt common.config.txt
 
-GETATTRS = python ../misc/getattrs.py
-FIXMAN = python ../misc/fixman.py
+GETATTRS = $(PYTHON) ../misc/getattrs.py
+FIXMAN = $(PYTHON) ../misc/fixman.py
 
 #AFLAGS = -a linkcss
 #AFLAGS = -a stylesheet=extra.css
diff --git a/sql/Makefile b/sql/Makefile
index 6ab01592..4bdc82d7 100644
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -9,6 +9,7 @@ all install clean distclean installcheck test:
 		DESTDIR="$(DESTDIR)" \
 		PG_CONFIG="$(PG_CONFIG)" \
 		PG_CPPFLAGS="$(PG_CPPFLAGS)" \
+		PYTHON="$(PYTHON)" \
 	  || exit $?; \
 	done
 
diff --git a/sql/common-pgxs.mk b/sql/common-pgxs.mk
index 175f1c99..25a4c747 100644
--- a/sql/common-pgxs.mk
+++ b/sql/common-pgxs.mk
@@ -64,8 +64,8 @@ include $(PGXS)
 
 NDOC = NaturalDocs
 NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-CATSQL = ../../scripts/catsql.py
-GRANTFU = ../../scripts/grantfu.py
+CATSQL = $(PYTHON) ../../scripts/catsql.py
+GRANTFU = $(PYTHON) ../../scripts/grantfu.py
 
 #
 # build rules, in case Contrib data must be always installed
diff --git a/upgrade/Makefile b/upgrade/Makefile
index 8f9c960f..33d52815 100644
--- a/upgrade/Makefile
+++ b/upgrade/Makefile
@@ -6,7 +6,7 @@ SQLS = v3.0_pgq_core.sql
 SRCS = $(addprefix src/, $(SQLS))
 DSTS = $(addprefix final/, $(SQLS))
 
-CATSQL = python ../scripts/catsql.py
+CATSQL = $(PYTHON) ../scripts/catsql.py
 
 all: $(DSTS)
 
-- 
2.39.5