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 315455ba559af8f7afd1b3d0932b6ef9f69b453a..704b37472ae6f176f34f584fa24f23858c99eee4 100644 (file)
--- 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