The following commit has been merged in the master branch: commit ed8b80e9b7bfb50d65cf6e09becd5eb7618bdc0f Author: Sven Eckelmann sven@narfation.org Date: Sat May 21 15:10:35 2011 +0200

batmand: 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 3b517da..804bdd4 100755 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # activate this variable to deactivate policy routing for backward compatibility #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING

-CC = gcc +CC ?= gcc CFLAGS += -pedantic -Wall -W -std=gnu99 EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lpthread