include support in storage volume xml files

note that there's now a PLATFORMDIR define that points to the actual
platform directory and that can be overridden in .target files

diff --git a/support/make/Makerules b/support/make/Makerules
index 8164f96659922189bf6473929166c26ecc8c58b0..6c48f9a0522bdfc1c972d011912e5a3ffcb55a86 100644 (file)
--- a/support/make/Makerules
+++ b/support/make/Makerules
@@ -133,6 +133,8 @@ endef
 -include $(TINYOS_MAKELOCAL)
 -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)))
 

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 6401c588ff86354e20f73132ee10ee68e571109b..d61f14f001d2b357a2fdbbb52f94f141874775e8 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -63,7 +63,7 @@ ifneq ($(wildcard $(VOLUMEFILE)), )
 exe0: $(BUILDDIR)/StorageVolumes.h
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-       tos-storage-at45db <$(VOLUMEFILE) >$@
+       tos-storage-at45db $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
 endif