From 0a04f98785178c0ce80eb51e4dad091ed26bbaeb Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 14 Feb 2019 09:00:41 +0000 Subject: [PATCH] projects.mk: Disable proj_query macros for undefined $TOPDIR proj_query based commands run projects.py, which needs $(TOPDIR), which in turn is undefined, notably for standalone-exe.mk. This commit avoids related warnings. Signed-off-by: Jan Lindemann --- make/projects.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/projects.mk b/make/projects.mk index 1ad3fd0e..3791b409 100644 --- a/make/projects.mk +++ b/make/projects.mk @@ -19,7 +19,9 @@ MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin) # -- Query the build system about other projects: PYTHON ?= /usr/bin/python2 +ifneq ($(TOPDIR),) proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PRJS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query = $(shell $(proj_query_cmd) $(1)) proj_dir = $(call proj_query,proj-dir $(1)) htdocs_dir = $(call proj_query,htdocs-dir $(1)) +endif