From: idgay <idgay>
Date: Wed, 11 Apr 2007 21:07:56 +0000 (+0000)
Subject: include support in storage volume xml files
X-Git-Tag: tinyos/2.0.1~76
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=da69e27c3d09b206c6d345143d22147374103c17;p=tinyos-2.x.git

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 8164f966..6c48f9a0 100644
--- 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 6401c588..d61f14f0 100644
--- 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