The following commit has been merged in the master branch: commit 9cd7382f815fbebe25381d5ad5da4cd5074f20cc Author: Elektra Wagenrad onelektra@gmx.net Date: Tue Dec 6 20:44:19 2011 +0100

Users or build servers may want to enable preprocessor specific options like -D_FORTIFY_SOURCE=2 that are usually placed in CPPFLAGS. The batmand makefile should not override these options to add own preprocessor variables.

Issued by: Sven Eckelmann sven@narfation.org

Signed off by Elektra Wagenrad onelektra@gmx.net

diff --git a/Makefile b/Makefile index 346b14a..65e0cf2 100755 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ MANPAGE = man/batmand.8

# batmand flags and options CFLAGS += -pedantic -Wall -W -std=gnu99 -MD -CPPFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) +CPPFLAGS += -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) LDLIBS += -lpthread

# disable verbose output