From: R. Steve McKown <rsmckown@gmail.com>
Date: Sun, 9 Dec 2012 17:35:34 +0000 (-0700)
Subject: Search for Makelocal in TOSMAKE_PATH
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=28d1ee6ff8aa43cf6769dbe46a31caa2411af268

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.
---

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)