From 940f26ce373a004207dcb9131c29ac7c5a616fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=90=E6=AD=AA?= Date: Tue, 22 Sep 2026 07:24:43 +0800 Subject: [PATCH] build: centralize Python executable definition Co-Authored-By: OpenAI Codex --- Makefile | 6 +++--- Makefile.defs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3ef4f1ab4..b5536fad4 100644 --- a/Makefile +++ b/Makefile @@ -355,17 +355,17 @@ style: commands --align-pointer=name {} \; COMMANDS_UTF8_FILTER := cat -COMMANDS_PYTHON := python3 +COMMANDS_PYTHON := $(PYTHON3) ifdef IS_MINGW COMMANDS_UTF8_FILTER := iconv -f CP850 -t UTF-8 - COMMANDS_PYTHON := PYTHONIOENCODING=utf-8 python3 + COMMANDS_PYTHON := PYTHONIOENCODING=utf-8 $(PYTHON3) endif commands: client # Update commands.md [ -x client/proxmark3 ] && client/proxmark3 -m | $(COMMANDS_UTF8_FILTER) | tr -d '\r' > doc/commands.md # Make sure python3 is installed - @command -v python3 >/dev/null || ( echo "Please install 'python3' package first" ; exit 1 ) + @command -v $(PYTHON3) >/dev/null || ( echo "Please install '$(PYTHON3)' package first" ; exit 1 ) # Update commands.json, patch port in case it was run under Windows [ -x client/proxmark3 ] && client/proxmark3 --fulltext | $(COMMANDS_UTF8_FILTER) | sed 's#com[0-9]#/dev/ttyACM0#'|$(COMMANDS_PYTHON) client/pyscripts/pm3_help2json.py - - | tr -d '\r' > doc/commands.json diff --git a/Makefile.defs b/Makefile.defs index 8cfcce10e..7304bb5f6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -53,6 +53,7 @@ USERMOD = usermod -aG ADDUSER = adduser GETENT_BL = getent group bluetooth +PYTHON3 ?= python3 PYTHON3_PKGCONFIG ?= python3 PATHSEP=/