make/defs.mk

@@ -7,10 +7,6 @@ JW_PKG_DEF_MK_INCLUDED       = true
 
 MAKEFLAGS                   += -r
 
-empty                       :=
-space                       := $(empty) $(empty)
-comma                       := ,
-
 include $(JWBDIR)/make/projects.mk
 
 # ----- Executables

make/platform.mk

@@ -3,6 +3,10 @@
 ifndef PLATFORM_MK_INCLUDED
 PLATFORM_MK_INCLUDED         = true
 
+empty                       :=
+space                       := $(empty) $(empty)
+comma                       := ,
+
 CACHE_PROJECT_MK            ?= $(TOPDIR)/.cache-project.mk
 CACHE_PROJECTS_MK           := $(JWBDIR)/.cache-projects.mk
 JW_PKG_NO_CACHE             ?= false

make/py-defs.mk

@@ -19,6 +19,8 @@ else
   PY_SITE_PACKAGES_PATH     := $(shell $(PYTHON) -c "import site; print([d for d in site.getsitepackages() if d.find('/local/') == -1][0])")
 endif
 
+PYTHON_RUNNER               ?= $(PYTHON)
+
 PY_SRC_PY                   ?= $(wildcard *.py)
 PY_LOCAL_PY                  = $(PY_SRC_PY)
 PY_INSTALL_PY                = $(filter-out __init__.py,$(PY_SRC_PY))

make/py-path.mk

@@ -1,4 +1,5 @@
-# -- PYTHONPATH
+include $(JWBDIR)/make/platform.mk # For JW_PKG_PY
+
 PYTHONPATH_ENV              := $(PYTHONPATH)
 ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
   JW_PKG_PYTHON_PATH        := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
@@ -14,4 +15,3 @@ py-tools.clean:
 
 py-path:
 	@echo "PYTHONPATH=$(PYTHONPATH)"
-	@#echo "MYPYPATH=$(MYPYPATH)"

make/py-run.mk

@@ -5,7 +5,6 @@ include $(JWBDIR)/make/run-success.mk
 
 EXE                         ?= $(firstword $(wildcard main.py runme.py test.py *.py))
 EXE_ARGS                    ?=
-PYTHON_RUNNER               ?= $(PYTHON)
 
 all:
 install: