e2a7a9e5ad7dfc637cfdd687fb80611dd74ea15e

diff --git a/Makefile.common b/Makefile.common
index cfdb37d30ab097fdcf5a5af20952b116ecbf2225..ff32da1fbce8b8858733909f0ece64b515584b85 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -55,19 +55,21 @@ ifeq (${shell uname}, Darwin)
   LFLAGS               = -L/opt/local/lib/
  else
   # That's for Homebrew libelf and avr-gcc support
-  ifeq (${shell test -d /usr/local/Cellar && echo Exists}, Exists)
-   ifneq (${shell test -d /usr/local/Cellar/avr-gcc/ && echo Exists}, Exists)
-    $(error Please install avr-gcc: brew tap larsimmisch/avr ; brew install avr-gcc avr-libc)
+  HOMEBREW_PREFIX ?= /usr/local
+  ifeq (${shell test -d $(HOMEBREW_PREFIX)/Cellar && echo Exists}, Exists)
+   ifneq (${shell test -d $(HOMEBREW_PREFIX)/Cellar/avr-gcc/ && echo Exists}, Exists)
+    $(error Please install avr-gcc: brew tap osx-cross/homebrew-avr ; brew install avr-libc)
    endif
-   ifneq (${shell test -d /usr/local/Cellar/libelf/ && echo Exists}, Exists)
+   ifneq (${shell test -d $(HOMEBREW_PREFIX)/Cellar/libelf/ && echo Exists}, Exists)
     $(error Please install libelf: brew install libelf)
    endif
    CC                  = clang
-   IPATH               += /usr/local/include /usr/local/include/libelf
-   LFLAGS              = -L/usr/local/lib/
-   AVR_ROOT    := $(firstword $(wildcard /usr/local/Cellar/avr-gcc/*/))
-   AVR_INC     := ${AVR_ROOT}/avr
-   AVR                 := /usr/local/bin/avr-
+   IPATH               += $(HOMEBREW_PREFIX)/include
+   LFLAGS              = -L$(HOMEBREW_PREFIX)/lib/
+   CFLAGS              += -I/$(HOMEBREW_PREFIX)/include/libelf
+   AVR_ROOT            := $(firstword $(wildcard $(HOMEBREW_PREFIX)/Cellar/avr-libc/*/))
+   AVR_INC             := ${AVR_ROOT}/avr
+   AVR                 := $(HOMEBREW_PREFIX)/bin/avr-
   endif
  endif
 else