From e1c044e298ee80a2b3f34e2d491ed6d66965a595 Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Mon, 17 Nov 2014 10:31:29 +0000
Subject: [PATCH] Do not append CPPFLAGS to CFLAGS

---
 Makefile  | 6 +++---
 config.mk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5d75f6e..10de069 100644
--- a/Makefile
+++ b/Makefile
@@ -134,10 +134,10 @@ bin: $(BIN)
 $(OBJ): $(HDR) config.mk
 
 .o:
-	$(LD) -o $@ $< libutil.a $(LDFLAGS)
+	$(LD) $(LDFLAGS) -o $@ $< libutil.a
 
 .c.o:
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 
 libutil.a: $(LIB)
 	$(AR) -r -c $@ $?
@@ -177,7 +177,7 @@ sbase-box: $(SRC) libutil.a
 	echo 'else {' >> build/$@.c
 	for f in $(SRC); do echo "printf(\"`basename $$f .c`\"); putchar(' ');" >> build/$@.c; done
 	echo "putchar(0xa); }; return 0; }" >> build/$@.c
-	$(LD) -o $@ build/*.c libutil.a $(CFLAGS) $(LDFLAGS)
+	$(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ build/*.c libutil.a
 	rm -r build
 
 clean:
diff --git a/config.mk b/config.mk
index 71f4195..a915eb3 100644
--- a/config.mk
+++ b/config.mk
@@ -9,5 +9,5 @@ MANPREFIX = $(PREFIX)/share/man
 #CC = musl-gcc
 LD = $(CC)
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE
-CFLAGS   = -std=c99 -Wall -pedantic $(CPPFLAGS)
+CFLAGS   = -std=c99 -Wall -pedantic
 LDFLAGS  = -s