From 3ddd9521870f45f6898bdc60eee992d260bf15f4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 22 Jun 2019 09:32:31 +0000 Subject: [PATCH] swig.mk: Swith to Python 3 Signed-off-by: Jan Lindemann --- make/swig.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/swig.mk b/make/swig.mk index e26f07c4..381cfc2e 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -1,4 +1,5 @@ include $(MODDIR)/make/defs.mk +include $(MODDIR)/make/py-defs.mk # for $(PYTHON) include $(MODDIR)/make/defs-cpp.mk include $(MODDIR)/make/dev-utils.mk @@ -51,9 +52,9 @@ else ifeq ($(SWIG_TARGET),android) else ifeq ($(SWIG_TARGET),python) - PYTHON_VERSION ?= $(basename $(lastword $(shell python2 --version 2>&1))) - PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_VERSION)) - PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_VERSION))) + PYTHON_FULL_VERSION ?= $(basename $(lastword $(shell $(PYTHON) --version 2>&1))) + PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_FULL_VERSION)) + PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_FULL_VERSION))) SWIG_LANG ?= python SWIG_TARGET_EXT ?= py