Search for Makelocal in TOSMAKE_PATH

[tinyos-2.x.git] / support / make / Makerules

diff --git a/support/make/Makerules b/support/make/Makerules
index 8164f96659922189bf6473929166c26ecc8c58b0..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,9 +127,15 @@ 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)
+
 #  Mark TOSMAKE_PATH with a + so that they're not searched for by TOSMake_find.
 $(foreach incdir,$(addprefix +,$(TOSMAKE_PATH)),$(call TOSMake_include_dir,$(incdir)))