--- src/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
+++ src/Makefile.in	2012-11-27 18:43:29.000000000 -0600
@@ -8,7 +8,7 @@
 INSTALL_BIN=@INSTALL_PROGRAM@
 INSTALL_DIR=@INSTALL_DIR@
 CFLAGS=@CFLAGS@ -fno-strict-aliasing
-CPPFLAGS=@CPPFLAGS@ -I../include
+CPPFLAGS=-I../include @CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 
 RES_SRC =
--- tools/Makefile.in.orig	2012-11-25 16:51:16.000000000 -0600
+++ tools/Makefile.in	2012-11-27 18:43:23.000000000 -0600
@@ -8,7 +8,7 @@
 INSTALL_BIN=@INSTALL_PROGRAM@
 INSTALL_DIR=@INSTALL_DIR@
 CFLAGS=@CFLAGS@ -fno-strict-aliasing
-CPPFLAGS=@CPPFLAGS@ -I../include
+CPPFLAGS=-I../include @CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 
 mkpasswd_SOURCES = mkpasswd.c