switch to __

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 708a4ab621592aab57d7f6401c6482988089dddb..b28b740fd57ccd8686c524dd1f206047f7f77107 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -36,11 +36,9 @@ PROGRAMMER ?= uisp
 NCC = ncc
 LIBS = -lm
 
-AMADDR = ActiveMessageAddressC\$$addr
-# Uncomment the next two lines if you have a toolchain without the dollar sign
-# patch. This needs nesc 1.2.8 or newer (1.2.9 is recommended).
-#PFLAGS += -fnesc-separator=__
-#AMADDR = ActiveMessageAddressC__addr
+# Use __ as the separator - requires nesC 1.2.9 or later
+PFLAGS += -fnesc-separator=__
+AMADDR = ActiveMessageAddressC__addr
 BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe
 MAIN_SREC = $(BUILDDIR)/main.srec