summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--top/maint.mk2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 416f2abec7..79d9229722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-03 Eric Blake <eblake@redhat.com>
+
+ maintainer-makefile: fix typo in previous patch
+ * top/maint.mk (_sc_search_regexp): Fix my accidental corruption
+ of Roman's work.
+
2019-01-02 Roman Bolshakov <r.bolshakov@yadro.com> (tiny change)
maintainer-makefile: prefer $(GREP) over grep
diff --git a/top/maint.mk b/top/maint.mk
index 19757fcf7f..4b574103a3 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -314,7 +314,7 @@ define _sc_search_regexp
: Check for the construct; \
if test -n "$$files"; then \
if test -n "$$prohibit"; then \
- echo "$$files"
+ echo "$$files" \
| xargs $(GREP) $$with_grep_options $(_ignore_case) -nE \
"$$prohibit" /dev/null \
| $(GREP) -vE "$${exclude:-^$$}" \