summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-09-26 23:11:18 +0200
committerJim Meyering <meyering@redhat.com>2008-09-26 23:21:25 +0200
commit2a4dcb627ea6310c2be0e8f570b470754bd1fc7e (patch)
treeb188f676cc644e337c251e33ba81898bdb6680af
parent13a2025998271ad69058987358c92074e627848c (diff)
downloadcoreutils-2a4dcb627ea6310c2be0e8f570b470754bd1fc7e.tar.xz
maint: relax a check so "make distcheck" succeeds again
* maint.mk (makefile-check): Relax the check, in order to exempt the necessary use of a sole @...@-delimited Makefile.am variable.
-rw-r--r--maint.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/maint.mk b/maint.mk
index 2987272fb..e5d3fee06 100644
--- a/maint.mk
+++ b/maint.mk
@@ -550,8 +550,11 @@ check-AUTHORS:
# Ensure that we use only the standard $(VAR) notation,
# not @...@ in Makefile.am, now that we can rely on automake
# to emit a definition for each substituted variable.
+# We use perl rather than "grep -nE ..." to exempt a single
+# use of an @...@-delimited variable name in src/Makefile.am.
makefile-check:
- @grep -nE '@[A-Z_0-9]+@' \
+ @perl -ne '/\@[A-Z_0-9]+\@/ && !/^cu_install_program =/' \
+ -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}' \
$$($(VC_LIST_EXCEPT) | grep -E '(^|/)Makefile\.am$$') \
&& { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :