[pyferret] 55/110: Pass @PYTHON@ to site_specific.mk

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 15bb8e9904a36780ecb264516ef48b903b93017c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 9 14:27:17 2016 +0100

    Pass @PYTHON@ to site_specific.mk
---
 debian/rules               | 18 +++++++++++++++---
 debian/site_specific.mk.in |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index bf98863..54b8568 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,17 +16,29 @@ LIBDIR:=/usr/lib/$(ARCH)
 INSTALLDIR:=$(CURDIR)/debian/tmp
 
 PY2VERS:=$(shell pyversions -r)
-PY3VERS:=$(shell py3versions -r)
+# PY3VERS:=$(shell py3versions -r)
 
 override_dh_auto_build:
+	cp debian/platform_specific.mk.debian .
+	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
+	# Python2.7
 	sed -e 's%@ARCH@%${ARCH}%' \
+		-e 's%@PYTHON@%${PY2VERS}%' \
                 -e 's%@LIBDIR@%${LIBDIR}%' \
 		-e 's%@CURDIR@%${CURDIR}%' \
                 -e 's%@INSTALLDIR@%${INSTALLDIR}%' \
                 < debian/site_specific.mk.in > site_specific.mk
 	cp site_specific.mk external_functions/ef_utility
-	cp debian/platform_specific.mk.debian .
-	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
+	dh_auto_build
+	# Python3
+	#sed -e 's%@ARCH@%${ARCH}%' \
+		-e 's%@PYTHON@%${PY3VERS}%' \
+                -e 's%@LIBDIR@%${LIBDIR}%' \
+		-e 's%@CURDIR@%${CURDIR}%' \
+                -e 's%@INSTALLDIR@%${INSTALLDIR}%' \
+                < debian/site_specific.mk.in > site_specific.mk
+	#cp site_specific.mk external_functions/ef_utility
+	#dh_auto_build
 
 override_dh_auto_install:
 	for p in $(PY2VERS) $(PY3VERS) ; do \
diff --git a/debian/site_specific.mk.in b/debian/site_specific.mk.in
index f9cfc8e..ed4d8f1 100644
--- a/debian/site_specific.mk.in
+++ b/debian/site_specific.mk.in
@@ -15,9 +15,9 @@ BUILDTYPE	= $(HOSTTYPE)
 BUILDARCH	= @ARCH@
 
 ## Python 2.x executable to invoke for build and install.
-PYTHON_EXE	= python2.7
+PYTHON_EXE	= @PYTHON@
 ## The assignment of PYTHONINCDIR should not need any modifications
-PYTHONINCDIR   := /usr/include/$(PYTHON_EXE)
+PYTHONINCDIR   := /usr/include/@PYTHON@
 
 ## Installation directory for built Ferret.  Using the "install"
 ## Makefile target circumvents the need to create the fer_*.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git