From 9147a78f2e1a39b01ff4485c5e3166914c857f27 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 6 Nov 2025 16:51:10 +0100 Subject: [PATCH] projects-dir.mk: Don't hardcode Makefile name "Makefile" is used in dependency checks within projects-dir.mk. Since it might be included from projects-dir-minimal.mk, which also works with "GNUmakefile", make this fallback of a predefinable variable, PROJECTS_MAKEFILE_NAME. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index a2971a67..297b06a0 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -22,6 +22,7 @@ .NOTPARALLEL: -include local.mk +PROJECTS_MAKEFILE_NAME ?= $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) # -- Find JWBDIR DEV_PROJECTS_DIR ?= . @@ -212,7 +213,7 @@ distclean: clean.text-files-cache clean.text-files-cache: rm -f $(TEXT_FILES_CACHE) list-files: - @realpath Makefile + @realpath PROJECTS_MAKEFILE_NAME @for p in $(BUILD_PROJECTS); do \ $(LIST_VCS_FILES_SH) -znf $$p | sed -z "s/^/$$p\//" | \ xargs -0 realpath ;\ @@ -401,7 +402,7 @@ git-check-conv: $(SSH_WRAPPER_SH) # --- rules -$(SSH_WRAPPER_SH): Makefile +$(SSH_WRAPPER_SH): $(PROJECTS_MAKEFILE_NAME) /bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp chmod 700 $@.tmp mv $@.tmp $@