changeset 17143:78950b779f13

maint.mk: rename a new configurable variable * top/maint.mk (_gl_translatable_string_re): Rename from translation-markers: _gl_ prefix to insulate from user Makefile code, and the _re suffix to inform that it's a regular expression.
author Jim Meyering <jim@meyering.net>
date Sun, 28 Oct 2012 08:38:09 +0100
parents 7bfb45962070
children e11d1d1ffefd
files ChangeLog top/maint.mk
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-28  Jim Meyering  <jim@meyering.net>
+
+	maint.mk: rename a new configurable variable
+	* top/maint.mk (_gl_translatable_string_re): Rename from
+	translation-markers: _gl_ prefix to insulate from user Makefile code,
+	and the _re suffix to inform that it's a regular expression.
+
 2012-10-26  Eric Blake  <eblake@redhat.com>
 
 	maint.mk: let packages tweak sc_po_check pattern
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1122,10 +1122,10 @@
 apply the above patch\n'
 
 # Verify that all source files using _() (more specifically, files that
-# contain the ERE translation-markers) are listed in po/POTFILES.in.
+# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in.
 po_file ?= $(srcdir)/po/POTFILES.in
 generated_files ?= $(srcdir)/lib/*.[ch]
-translation-markers ?= \b(N?_|gettext *)\([^)"]*("|$$)
+_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
 sc_po_check:
 	@if test -f $(po_file); then					\
 	  grep -E -v '^(#|$$)' $(po_file)				\
@@ -1145,7 +1145,7 @@
 	    esac;							\
 	    files="$$files $$file";					\
 	  done;								\
-	  grep -E -l '$(translation-markers)' $$files			\
+	  grep -E -l '$(_gl_translatable_string_re)' $$files		\
 	    | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2;	\
 	  diff -u -L $(po_file) -L $(po_file) $@-1 $@-2			\
 	    || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; };	\