From: Jim Meyering <meyering@redhat.com>
Date: Sat, 4 Jun 2011 17:56:58 +0000 (+0200)
Subject: maint.mk: sc_unmarked_diagnostics: don't hard-code "error"
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b95ee0afed91f941fccd71252c8b2e72ae4544;p=pspp

maint.mk: sc_unmarked_diagnostics: don't hard-code "error"

* top/maint.mk (sc_unmarked_diagnostics): Don't hard-code the
function name, "error".
(_gl_translatable_diag_func_re): New configurable variable.
---

diff --git a/ChangeLog b/ChangeLog
index b38b724ce6..cdc4f06ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-04  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: sc_unmarked_diagnostics: don't hard-code "error"
+	* top/maint.mk (sc_unmarked_diagnostics): Don't hard-code the
+	function name, "error".
+	(_gl_translatable_diag_func_re): New configurable variable.
+
 2011-06-04  Bruno Haible  <bruno@clisp.org>
 
 	getopt: Avoid gcc warning.
diff --git a/top/maint.mk b/top/maint.mk
index c55571cb47..6f6b8be391 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -684,11 +684,16 @@ sc_two_space_separator_in_usage:
 	halt='help2man requires at least two spaces between an option and its description'\
 	  $(_sc_search_regexp)
 
+# A regexp matching function names like "error" that may be used
+# to emit translatable messages.
+_gl_translatable_diag_func_re ?= error
+
 # Look for diagnostics that aren't marked for translation.
 # This won't find any for which error's format string is on a separate line.
 sc_unmarked_diagnostics:
 	@grep -nE							\
-	    '\<error *\([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))	\
+	    '\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
+		$$($(VC_LIST_EXCEPT))					\
 	  | grep -Ev '(_|ngettext ?)\(' &&				\
 	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
 	    exit 1; } || :