janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects-dir.mk: Don't hardcode Makefile name

Browse source 
"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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2025-11-06 16:51:10 +01:00
commit 9147a78f2e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/projects-dir.mk
View file

@ -22,6 +22,7 @@
.NOTPARALLEL: .NOTPARALLEL:
-include local.mk -include local.mk
PROJECTS_MAKEFILE_NAME ?= $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
# -- Find JWBDIR # -- Find JWBDIR
DEV_PROJECTS_DIR ?= . DEV_PROJECTS_DIR ?= .
@ -212,7 +213,7 @@ distclean: clean.text-files-cache
clean.text-files-cache: clean.text-files-cache:
rm -f $(TEXT_FILES_CACHE) rm -f $(TEXT_FILES_CACHE)
list-files: list-files:
@realpath Makefile @realpath PROJECTS_MAKEFILE_NAME
@for p in $(BUILD_PROJECTS); do \ @for p in $(BUILD_PROJECTS); do \
$(LIST_VCS_FILES_SH) -znf $$p | sed -z "s/^/$$p\//" | \ $(LIST_VCS_FILES_SH) -znf $$p | sed -z "s/^/$$p\//" | \
xargs -0 realpath ;\ xargs -0 realpath ;\
@ -401,7 +402,7 @@ git-check-conv: $(SSH_WRAPPER_SH)
# --- rules # --- 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 /bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp
chmod 700 $@.tmp chmod 700 $@.tmp
mv $@.tmp $@ mv $@.tmp $@