Subject: Makefile rule fix and cleanup patches

From: Jim Meyering <[email-masked]>
Date: Fri, 6 Jun 2014 16:48:12 -0700

I nearly omitted the second, since using scripts
for egrep and fgrep may be removed, but left it
in on principle: set a good example.