From: Michel Pollet <github.com@pollet.net>
Date: Tue, 19 Jan 2016 09:41:34 +0000 (+0000)
Subject: Merge pull request #149 from jedahan/homebrew-prefix
X-Git-Tag: v1.3~1
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=f352d021ecd0bcd58c5d747c84364f7357af809d;p=sx%2Fsimavr.git

Merge pull request #149 from jedahan/homebrew-prefix

Allow for homebrew installed avr-gcc to any prefix
---

f352d021ecd0bcd58c5d747c84364f7357af809d
diff --cc Makefile.common
index a46b578,ff32da1..e7cee3d
--- a/Makefile.common
+++ b/Makefile.common
@@@ -51,24 -51,16 +51,25 @@@ ifeq (${shell uname}, Darwin
   AVR 		:= ${AVR_ROOT}/bin/avr-
   # Thats for MacPorts libelf
   ifeq (${shell test -d /opt/local && echo Exists}, Exists)
 -  IPATH		+= /opt/local/include
 -  LFLAGS		= -L/opt/local/lib/
 +  ifneq (${shell test -d /opt/local/avr && echo Exists}, Exists)
 +   $(error Please install avr-gcc: port install avr-gcc avr-libc)
 +  endif
 +  ifneq (${shell test -d /opt/local/include/libelf && echo Exists}, Exists)
 +   $(error Please install libelf: port install libelf)
 +  endif
 +  CC		= clang
 +  IPATH		+= /opt/local/include /opt/local/include/libelf
 +  LFLAGS	= -L/opt/local/lib/
 +  AVR_INC 	:= /opt/local/avr
 +  AVR 		:= /opt/local/bin/avr-
   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