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 6c48f9a0522bdfc1c972d011912e5a3ffcb55a86..adad8c20f5e406f1b5e8c4b9f1d66305e0a1f51b 100644 (file)
--- 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)