From 2a4dcb627ea6310c2be0e8f570b470754bd1fc7e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 26 Sep 2008 23:11:18 +0200 Subject: 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. --- maint.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'maint.mk') 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; } || : -- cgit v1.2.3-54-g00ecf