From a82fa9023bf1de977341a54a6391fd14673c27ba Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 16 May 2020 13:09:16 +0000
Subject: [PATCH] py-xxx.mk: Introduce PYTHON_MAJOR

Where *.pyc files are created is decided by PYTHON_MAJOR, not PYTHON_VERSION,
so introduce it.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/py-defs.mk  | 5 +++--
 make/py-rules.mk | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/py-defs.mk b/make/py-defs.mk
index 2144bae6..23e616f4 100644
--- a/make/py-defs.mk
+++ b/make/py-defs.mk
@@ -6,6 +6,7 @@ ifeq ($(PYTHON),)
 else
   PYTHON_VERSION            ?= $(patsubst python%,%,$(notdir $(PYTHON)))
 endif
+PYTHON_MAJOR                 = $(basename $(PYTHON_VERSION))
 
 ifeq ($(DEVELOPMENT),true)
   PY_SITE_PACKAGES_PATH     := $(PREFIX)/python$(PYTHON_VERSION)/site-packages
@@ -26,7 +27,7 @@ PY_MYPY                     ?= mypy --ignore-missing-imports
 PY_SRC_PY                   ?= $(wildcard *.py)
 PY_ALL_PY                    = $(PY_SRC_PY)
 
-ifneq ($(PYTHON_VERSION),3)
+ifneq ($(PYTHON_MAJOR),3)
   PY_PYC                     = $(patsubst %.py,%.pyc,$(PY_ALL_PY))
 else
   PY_CPYTHON_PREFIX         := $(shell $(PYTHON) -c "import sys; print('cpython-{}{}'.format(sys.version_info[0],sys.version_info[1]))")
@@ -55,7 +56,7 @@ else
   endif
 endif
 
-ifeq ($(PYTHON_VERSION),3)
+ifeq ($(PYTHON_MAJOR),3)
   PY_INSTALL_DIR_PYC        ?= $(PY_INSTALL_DIR_PY)/__pycache__
 else
   PY_INSTALL_DIR_PYC        ?= $(PY_INSTALL_DIR_PY)
diff --git a/make/py-rules.mk b/make/py-rules.mk
index 44179362..aaa8f3d0 100644
--- a/make/py-rules.mk
+++ b/make/py-rules.mk
@@ -15,14 +15,14 @@ install-reg.done: install-dirs.done $(PY_INSTALLED_REG)
 $(PY_INSTALL_DIR_PY)/%.py: %.py
 	$(INSTALL) -p -m $(PYMODMODE) -o $(PYMODOWNER) -g $(PYMODGROUP) $< $@
 
-ifneq ($(PYTHON_VERSION),3)
+ifneq ($(PYTHON_MAJOR),3)
 %.pyc: %.py
 else
 __pycache__/%.$(PY_CPYTHON_PREFIX).pyc: %.py
 endif
 	$(PYTHON) -c "import py_compile; py_compile.compile(\"$<\", doraise=True)"
 
-ifeq ($(PYTHON_VERSION),3)
+ifeq ($(PYTHON_MAJOR),3)
 $(PY_INSTALL_DIR_PY)/__pycache__/%.$(PY_CPYTHON_PREFIX).pyc: __pycache__/%.$(PY_CPYTHON_PREFIX).pyc
 else
 $(PY_INSTALL_DIR_PY)/%.pyc: %.pyc