From 28d1ee6ff8aa43cf6769dbe46a31caa2411af268 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Sun, 9 Dec 2012 10:35:34 -0700 Subject: [PATCH] Search for Makelocal in TOSMAKE_PATH User code may provide its own Makelocal via TOSMAKE_PATH. This only works correct if TOS_MAKE_PATH is added to the end of TOSMAKE_PATH so local paths take precedence. --- support/make/Makerules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/support/make/Makerules b/support/make/Makerules index 6c48f9a0..adad8c20 100644 --- a/support/make/Makerules +++ b/support/make/Makerules @@ -42,9 +42,6 @@ ifndef TINYOS_MAKE_PATH endif endif -# Use a default Makelocal if it's not defined already. -TINYOS_MAKELOCAL ?= $(TINYOS_MAKE_PATH)/Makelocal - # Use a default Makedefaults if it's not defined already. TINYOS_MAKEDEFAULTS ?= $(TINYOS_MAKE_PATH)/Makedefaults @@ -130,7 +127,11 @@ endef ### --- # Makelocal comes first to allow overriding Makedefaults. +ifeq (,$(TINYOS_MAKELOCAL)) +$(call TOSMake_include,Makelocal) +else -include $(TINYOS_MAKELOCAL) +endif -include $(TINYOS_MAKEDEFAULTS) PLATFORMDIR ?= $(TOSDIR)/platforms/$(PLATFORM) -- 2.39.2