The following commit has been merged in the master branch: commit 8ae5eed8e9225045f449246cabf057ea7aa79cf4 Author: Sven Eckelmann sven@narfation.org Date: Sat May 21 14:28:11 2011 +0200

batctl: Only define CC when not already specified

It is possible that a build environment specifies the CC different than gcc (for example gcc-4.6). The Makefile should only set it when the compiler wasn't explicitely set.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/Makefile b/Makefile index f95a9d2..a06177d 100755 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifndef V endif endif

-CC = gcc +CC ?= gcc CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lm