--- a/vixie-cron-4.1-r12.ebuild	2011-12-31 08:58:21.000000000 -0600
+++ b/vixie-cron-4.1-r12.ebuild	2012-03-21 22:03:48.454566118 -0500
@@ -44,15 +44,19 @@
 
 	use pam && epatch ${FILESDIR}/${P}-pam.patch
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+
+	sed -i Makefile \
+		-e "s|gcc \(-Wall.*\)|$(tc-getCC) \1|" \
+		-e 's|^INCLUDE[ \t]\+=\(.*\)|CPPFLAGS+=\1|' \
+		-e '/^CFLAGS	/d' \
+		-e '/^LDFLAGS	/d' \
+		-e 's/$(LDFLAGS)/$(CFLAGS) $(CPPFLAGS) &/' \
+		|| die "sed Makefile failed"
 }
 
 src_compile() {
 	use debug && append-flags -DDEBUGGING
 
-	sed -i -e "s:gcc \(-Wall.*\):$(tc-getCC) \1 ${CFLAGS}:" \
-		-e "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
-
 	emake || die "emake failed"
 }