* maint.mk: Resynchronize from gnulib.
* cfg.mk (_gl_translatable_string_re): Reflect new gnulib naming.
---
cfg.mk | 3 ++-
maint.mk | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 6aaa394..0d3b2f9 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -59,7 +59,8 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX = \
# Tweak how some of the syntax check rules work
_makefile_at_at_check_exceptions = ' && !/INTLTOOL_XML_RULE/'
-translation-markers = (\b(N?_|gettext *)\([^)"]*("|$$))|(<(_[a-zA-Z]*).*/\5>)
+_gl_translatable_string_re = \
+ (\b(N?_|gettext *)\([^)"]*("|$$))|(<(_[a-zA-Z]*).*/\5>)
# Functions like free() that are no-ops on NULL arguments.
useless_free_options = \
diff --git a/maint.mk b/maint.mk
index de7a303..ea44ece 100644
--- a/maint.mk
+++ b/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; }; \
--
1.7.11.7
_______________________________________________
virt-tools-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-tools-list
