Fix support for '--with-python=PYTHON' configure flag

diff --git a/doc/Makefile b/doc/Makefile
index 1baffd2e01359c36745feffbce8144e401f1a02e..8b7de2ec69a210bae1cf2d963ffbf728ad2f2680 100644 (file)
--- 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 6ab01592ceb225c710f1dff80dfea1775ecb05ae..4bdc82d7ae9ecf4674a50f886ffc46a36ce7491f 100644 (file)
--- 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 175f1c99d3f2bc8a6c48f907d47772aafa7bef53..25a4c747136c95e6601a5050b9460a6d46c244f1 100644 (file)
--- 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 8f9c960f1316d74498031b785f6c182e9e5649d1..33d528152df2897f3ea2e2ed9d2aaac6be775584 100644 (file)
--- 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)