Changed bsl.exra to search for the string between the commas and not short circuiting...

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index d3acf1d74491ef1014eb333768222f790721b5ce..f9230bb2d3b7cd5a48e923ce135ad14509dfeb1d 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -97,7 +97,7 @@ ifneq ($(wildcard $(VOLUMEFILE)), )
 exe0: $(BUILDDIR)/StorageVolumes.h
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-       $(VOLUME_ALLOCATOR) $(PLATFORMDIR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@ || rm -f $@
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
 endif

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 276fadb7ea72f4da60c837de232643a1ae58dc35..6a434f87d928530c75eba202480cb049de981ac3 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -68,7 +68,7 @@ exe0: $(BUILDDIR)/StorageVolumes.h
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
-       $(VOLUME_ALLOCATOR) $(PLATFORMDIR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUME_FILE) >$@ || rm -f $@
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUME_FILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
 endif