From 39c174e4c929f88bc88cae2bdf0d5e2a7c786503 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Thu, 20 Mar 2025 21:44:04 +0100 Subject: [PATCH 1/3] fix wrong usage of sources-target --- src/mxmake/topics/applications/zope.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxmake/topics/applications/zope.mk b/src/mxmake/topics/applications/zope.mk index 3d6cc4d..13f4afc 100644 --- a/src/mxmake/topics/applications/zope.mk +++ b/src/mxmake/topics/applications/zope.mk @@ -82,7 +82,7 @@ $(ZOPE_INSTANCE_TARGET): $(COOKIECUTTER_TARGET) $(ZOPE_CONFIGURATION_FILE) @cookiecutter -f --no-input ${ZOPE_COOKIECUTTER_TEMPLATE_OPTIONS} --config-file $(ZOPE_CONFIGURATION_FILE) --output-dir $(ZOPE_BASE_FOLDER) $(ZOPE_TEMPLATE) .PHONY: zope-instance -zope-instance: $(ZOPE_INSTANCE_TARGET) $(SOURCES) +zope-instance: $(ZOPE_INSTANCE_TARGET) $(SOURCES_TARGET) .PHONY: zope-start zope-start: $(ZOPE_RUN_TARGET) From 857465a44f3e24d7d740e92a86df2eb618fc127e Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Thu, 20 Mar 2025 21:44:45 +0100 Subject: [PATCH 2/3] set default for OS instead of assigning a possible non existing variable --- src/mxmake/topics/core/mxenv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxmake/topics/core/mxenv.mk b/src/mxmake/topics/core/mxenv.mk index c352fcf..a5691d5 100644 --- a/src/mxmake/topics/core/mxenv.mk +++ b/src/mxmake/topics/core/mxenv.mk @@ -75,7 +75,7 @@ # mxenv ############################################################################## -export OS:=$(OS) +OS?= # Determine the executable path ifeq ("$(VENV_ENABLED)", "true") From 32eee8a299402fc96a3a109a8c0b5cce4d1bb683 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Thu, 20 Mar 2025 21:46:39 +0100 Subject: [PATCH 3/3] fix test --- src/mxmake/tests/test_templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxmake/tests/test_templates.py b/src/mxmake/tests/test_templates.py index af89042..f04a2c2 100644 --- a/src/mxmake/tests/test_templates.py +++ b/src/mxmake/tests/test_templates.py @@ -665,7 +665,7 @@ def test_Makefile(self, tempdir): # mxenv ############################################################################## - export OS:=$(OS) + OS?= # Determine the executable path ifeq ("$(VENV_ENABLED)", "true")