From ecd7e76d91be52da7443711e6592b14bb9c13f70 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 2 Mar 2008 17:21:15 +0000
Subject: [PATCH] Fix batman compilation by using EXTRA_CFLAGS and not
 overriding CFLAGS

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman@10541 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile                       |  2 +-
 patches/001-extra_cflags.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 patches/001-extra_cflags.patch

diff --git a/Makefile b/Makefile
index e25d0db..ec4254c 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ Kernel gateway module for B.A.T.M.A.N.
 endef
 
 MAKE_ARGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
+	EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 	CCFLAGS="$(TARGET_CFLAGS)" \
 	OFLAGS="$(TARGET_CFLAGS)" \
 	REVISION="$(PKG_REV)" \
diff --git a/patches/001-extra_cflags.patch b/patches/001-extra_cflags.patch
new file mode 100644
index 0000000..ac6384f
--- /dev/null
+++ b/patches/001-extra_cflags.patch
@@ -0,0 +1,12 @@
+diff -urN batmand-r963/linux/modules/Makefile.kbuild batmand-r963.new/linux/modules/Makefile.kbuild
+--- batmand-r963/linux/modules/Makefile.kbuild	2008-01-28 08:47:35.000000000 +0100
++++ batmand-r963.new/linux/modules/Makefile.kbuild	2008-03-02 18:24:49.000000000 +0100
+@@ -3,7 +3,7 @@
+ endif
+ 
+ LINUX26:=2.6
+-CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\"
++EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\"
+ 
+ ifeq ($(strip $(findstring $(LINUX26),$(LINUX_VERSION))),$(LINUX26))
+ 
-- 
2.35.1