X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=support%2Fmake%2FMakerules;h=adad8c20f5e406f1b5e8c4b9f1d66305e0a1f51b;hp=6c48f9a0522bdfc1c972d011912e5a3ffcb55a86;hb=28d1ee6ff8aa43cf6769dbe46a31caa2411af268;hpb=13e400e82fdf39ec7807c7b290136408044d6273 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)