wiring the wrong resource

[tinyos-2.x.git] / support / make / avr / avr.rules

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 02e11fc5479e9e83f7a675335eb23c57512d004f..a8c5d025884e010d877fcdd857d93649df303bba 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -37,7 +37,7 @@ LIBS = -lm
 
 # Use __ as the separator - requires nesC 1.2.9 or later
 ifneq ($(filter sim,$(GOALS)),sim)
-ifneq ($(filter sim-sim,$(GOALS)),sim-sim)
+ifneq ($(filter sim-sf,$(GOALS)),sim-sf)
        PFLAGS += -fnesc-separator=__
 endif
 endif
@@ -68,6 +68,9 @@ else
 endif
 
 ifeq ($(PROGRAMMER),avrdude)
+  ifeq ($(findstring Darwin, $(shell uname)), Darwin)
+    AVRDUDE_CONF ?= /opt/local/etc/avrdude.conf
+  endif
   AVRDUDE_CONF ?= /etc/avrdude/avrdude.conf
   ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
     AVRDUDE_CONF := $(shell cygpath -m $(AVRDUDE_CONF))