From 956aea82ebecd1c755dff8735a3ebef4e972bf85 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 3 Jun 2019 08:00:39 +0000 Subject: [PATCH] py-*.mk: Fix python version detection Signed-off-by: Jan Lindemann --- make/py-defs.mk | 4 ++-- make/py-mod.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make/py-defs.mk b/make/py-defs.mk index 8c45b750..220d1d3d 100644 --- a/make/py-defs.mk +++ b/make/py-defs.mk @@ -20,7 +20,7 @@ PY_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py) PY_MODULES ?= $(PY_PROJ_MODULES) PY_SRC_PY ?= $(wildcard *.py) PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py) -ifneq ($(PYTHON),python3) +ifneq ($(PYTHON_VERSION),3) PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY)) else PY_PYC = $(patsubst %.py,__pycache__/%.cpython-37.pyc,$(PY_ALL_PY)) @@ -35,7 +35,7 @@ else endif PY_MOD ?= $(subst /,.,$(PY_INSTALL_MOD)) PY_INSTALL_DIR_PY ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD)) -ifeq ($(PYTHON),python3) +ifeq ($(PYTHON_VERSION),3) PY_INSTALL_DIR_PYC ?= $(PY_INSTALL_DIR_PY)/__pycache__ endif PY_INSTALL_DIRS ?= $(PY_INSTALL_DIR_PY) $(PY_INSTALL_DIR_PYC) diff --git a/make/py-mod.mk b/make/py-mod.mk index 69f9068d..b9ef4a23 100644 --- a/make/py-mod.mk +++ b/make/py-mod.mk @@ -29,7 +29,7 @@ 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),python3) +ifneq ($(PYTHON_VERSION),3) %.pyc: %.py else __pycache__/%.cpython-37.pyc: %.py