From 3defee72dc47800c5bb753c7ce0b7502554ac012 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Sat, 24 Sep 2022 17:25:15 -0500 Subject: [PATCH] fix: collect correct file when invoked with -f --- src/builtins.mk | 3 ++- src/help.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/builtins.mk b/src/builtins.mk index ea9c166..296bd3b 100644 --- a/src/builtins.mk +++ b/src/builtins.mk @@ -29,7 +29,8 @@ tconfirm = $(call py,confirm_py,$(1)) _update-task.mk: $(call tprint,{a.b_cyan}Updating task.mk{a.end}) curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk -export MAKEFILE_LIST MAKE +TASK_MAKEFILE_LIST := $(filter-out $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)),$(MAKEFILE_LIST)) +export MAKEFILE_LIST MAKE TASK_MAKEFILE_LIST ifndef INHERIT_SHELL SHELL := $(shell which bash) endif diff --git a/src/help.py b/src/help.py index 4adc615..3a27893 100644 --- a/src/help.py +++ b/src/help.py @@ -82,7 +82,10 @@ def recipe_help_header(goal): def get_goal_deps(goal="task.mk"): make = os.getenv("MAKE", "make") - database = subprocess.check_output([make, "-p", "-n"], universal_newlines=True) + cmd = [make, "-p", "-n", "-i"] + for file in os.getenv("TASK_MAKEFILE_LIST", "").split(): + cmd.extend(["-f", file]) + database = subprocess.check_output(cmd, universal_newlines=True) dep_pattern = re.compile(r"^" + goal + ":(.*)?") for line in database.splitlines(): match = dep_pattern.search(line) @@ -196,4 +199,5 @@ def main(): if __name__ == "__main__": main() + #% endblock %#