From fe5756d761e5d3314d2d733a4747b05c338db784 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Thu, 18 Jun 2026 11:19:07 +0200
Subject: [PATCH] py-defs.mk: Move all path defs into py-path.mk

py-path.mk is the place to host PYTHONPATH and MYPYPATH definitions,
so move them there from py-defs.mk for consistency. Also, remove some
dead code.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/py-defs.mk | 17 -----------------
 make/py-path.mk |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/make/py-defs.mk b/make/py-defs.mk
index 4c104b9f..b96d5cf4 100644
--- a/make/py-defs.mk
+++ b/make/py-defs.mk
@@ -71,20 +71,6 @@ ifeq ($(PY_INSTALL_REG),true)
   PY_INSTALLED_REG           = $(PY_INSTALLED_PY) $(PY_INSTALLED_PYC) $(PY_INSTALLED_PY_TYPED)
 endif
 
-ifeq ($(origin PYTHONPATH),undefined)
-  PYTHONPATH                := $(JW_PKG_PYTHON_PATH)
-endif
-
-#PYTHONPATH                  = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))
-MYPYPATH                     = $(PYTHONPATH)
-export PYTHONPATH MYPYPATH
-
-# not used anywhere
-#PY_PROJ_MODULE_DIRS        ?= $(wildcard $(foreach subdir,/tools/python /src/python,$(addsuffix $(subdir),$(TOPDIR) $(PY_PREREQ_BUILD_DIRS))))
-#PY_MODULE_DIRS             ?= $(PY_PROJ_MODULE_DIRS)
-#PY_MODULES                 ?= $(PY_PROJ_MODULES)
-#PY_PROJ_MODULES            += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py))
-
 ifneq ($(PY_DEFS_MK_INCLUDED),true)
 all:
 clean: pyc.clean
@@ -99,9 +85,6 @@ echo-py:
 	@echo 'MYPYPATH                = $(MYPYPATH)'
 	@echo 'PY_INSTALL_MOD          = $(PY_INSTALL_MOD)'
 	@echo 'PY_INSTALL_SUB_MOD      = $(PY_INSTALL_SUB_MOD)'
-	# not used anywhere'
-	#@echo 'PY_PROJ_MODULE_DIRS    = $(PY_PROJ_MODULE_DIRS)'
-	#@echo 'PY_MODULE_DIRS         = $(PY_MODULE_DIRS)'
 
 pyc.clean:
 	$(RM) -rf $(wildcard *.pyc) __pycache__
diff --git a/make/py-path.mk b/make/py-path.mk
index 39c72737..d6fee0cb 100644
--- a/make/py-path.mk
+++ b/make/py-path.mk
@@ -1,7 +1,7 @@
 # -- PYTHONPATH
 PYTHONPATH_ENV              := $(PYTHONPATH)
-JW_PKG_PYTHON_PATH_PREREQ   += $(PROJECT)
 ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
   JW_PKG_PYTHON_PATH        := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
 endif
 export PYTHONPATH           := $(subst $(space),:,$(JW_PKG_PYTHON_PATH))
+export MYPYPATH             := $(PYTHONPATH)