From 04e49dd5a91f7113d000d4bd61f79bc14198b184 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 28 Oct 2012 08:38:09 +0100 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ top/maint.mk | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a379c32ba..ea23e5af0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-10-28 Jim Meyering + + 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 maint.mk: let packages tweak sc_po_check pattern diff --git a/top/maint.mk b/top/maint.mk index de7a303d3..ea44eceb1 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1122,10 +1122,10 @@ fix_po_file_diag = \ 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 @@ sc_po_check: 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; }; \ -- 2.11.0