From: Jim Meyering <meyering@redhat.com>
Date: Fri, 26 Sep 2008 21:11:18 +0000 (+0200)
Subject: maint: relax a check so "make distcheck" succeeds again
X-Git-Tag: v7.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4dcb627ea6310c2be0e8f570b470754bd1fc7e;p=thirdparty%2Fcoreutils.git

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.
---

diff --git a/maint.mk b/maint.mk
index 2987272fb0..e5d3fee062 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; } || :