ubi-utils: fix compilation errors when using CPPFLAGS

The CPPFLAGS in the env changes how make initializes/appends CPPFLAGS
in sub-makes. This causes the old ubi utils to find the newer headers
at ubi-utils/include/ before the ubi-utils/old-utils/inc/.

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/old-utils/Makefile b/ubi-utils/old-utils/Makefile
index 5d205928d8a7037ed267684bb1936c085ed98b04..acdb31a698000558a38a1042021629fb6d991913 100644 (file)
--- a/ubi-utils/old-utils/Makefile
+++ b/ubi-utils/old-utils/Makefile
@@ -5,8 +5,8 @@
 KERNELHDR := ../../include
 
 CFLAGS ?= -O2 -g -Werror
-CPPFLAGS += -I./inc -I./src -I$(KERNELHDR) \
-       -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
+CPPFLAGS := -I./inc -I./src -I$(KERNELHDR) \
+       -std=gnu99 -DPACKAGE_VERSION=\"1.0\" $(CPPFLAGS)
 
 PERLPROGS = mkpfi ubicrc32.pl