From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 12 Aug 2012 19:24:15 +0000 (-0400)
Subject: fix handling of CPPFLAGS
X-Git-Tag: mdadm-3.3-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb624f78b9203416d2d35bb69148d7dce2bcf55a;p=thirdparty%2Fmdadm.git

fix handling of CPPFLAGS

The current Makefile ends up ignoring the system CPPFLAGS settings,
so make sure we append the variable.  Also, the old metadata logic
has a typo with the flag name.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Makefile b/Makefile
index 315455ba..704b3747 100644
--- a/Makefile
+++ b/Makefile
@@ -48,12 +48,10 @@ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
 endif
 
 ifdef DEBIAN
-CPPFLAGS := -DDEBIAN
-else
-CPPFLAGS :=
+CPPFLAGS += -DDEBIAN
 endif
 ifdef DEFAULT_OLD_METADATA
- CPPFLAG += -DDEFAULT_OLD_METADATA
+ CPPFLAGS += -DDEFAULT_OLD_METADATA
  DEFAULT_METADATA=0.90
 else
  DEFAULT_METADATA=1.2