From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 26 Mar 2010 08:14:34 +0000 (+0100)
Subject: top/maint.mk (sc_texinfo_acronym): Don't infloop if there is no *.texi files.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=decf3017fc407865acdaa20ee4795b50a010239a;p=pspp

top/maint.mk (sc_texinfo_acronym): Don't infloop if there is no *.texi files.

Reported by Eric Blake <eblake@redhat.com>.
---

diff --git a/ChangeLog b/ChangeLog
index 5b11d6212a..d833549bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-26  Simon Josefsson  <simon@josefsson.org>
+
+	* top/maint.mk (sc_texinfo_acronym): Don't infloop if there is
+	no *.texi files.  Reported by Eric Blake <eblake@redhat.com>.
+
 2010-03-25  Eric Blake  <eblake@redhat.com>
 
 	maint: use pragma consistently across replacement headers
diff --git a/top/maint.mk b/top/maint.mk
index 09da20afc8..6127c572f3 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -563,10 +563,13 @@ sc_GFDL_version:
 
 # Don't use Texinfo @acronym{} as it is not a good idea.
 sc_texinfo_acronym:
-	@grep -nE '@acronym{'						\
-	    $$($(VC_LIST_EXCEPT) | grep -E '\.texi$$') &&		\
+	@if $(VC_LIST_EXCEPT) | grep -lE '\.texi$$' >/dev/null; then	\
+		grep -nE '@acronym{'					\
+			$$($(VC_LIST_EXCEPT) | grep -E '\.texi$$') &&	\
 	  { echo '$(ME): found use of Texinfo @acronym{}' 1>&2;		\
-	    exit 1; } || :
+	    exit 1; } || :;						\
+	else :;								\
+	fi
 
 cvs_keywords = \
   Author|Date|Header|Id|Name|Locker|Log|RCSfile|Revision|Source|State