Search for Makelocal in TOSMAKE_PATH

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

diff --git a/support/make/Makerules b/support/make/Makerules
index 6850fb1376b36c179da878bc4452a0f29c4eab1b..adad8c20f5e406f1b5e8c4b9f1d66305e0a1f51b 100644 (file)
--- a/support/make/Makerules
+++ b/support/make/Makerules
@@ -42,16 +42,11 @@ 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
 
 #  Allow users to specify additional directories to find TOSMake files.
-TOSMAKE_TEMP_PATH := $(TOSMAKE_PATH)
-TOSMAKE_PATH = $(TINYOS_MAKE_PATH) 
-TOSMAKE_PATH += $(TOSMAKE_TEMP_PATH)
+TOSMAKE_PATH += $(TINYOS_MAKE_PATH)
 
 #  Save makecmdgoals (a read only var) to goals so that we can modify it.
 GOALS += $(MAKECMDGOALS)
@@ -132,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)