build: when po-check fails, say why and suggest a fix

* Makefile.maint (po-check): Before, when this check failed, it just
spat out a diff mentioning two temporary files.  Now, it tells you
what's wrong and suggests a fix with a patch using the name of the
affected file (rather than temporary file names) in the diff output.
This commit is contained in:
Jim Meyering 2008-10-16 17:18:48 +00:00
parent eeff3cdcbc
commit c16d74a12a
2 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,11 @@
Thu Oct 16 19:17:25 +0200 Jim Meyering <meyering@redhat.com>
build: when po-check fails, say why and suggest a fix
* Makefile.maint (po-check): Before, when this check failed, it just
spat out a diff mentioning two temporary files. Now, it tells you
what's wrong and suggests a fix with a patch using the name of the
affected file (rather than temporary file names) in the diff output.
Thu Oct 16 17:02:00 CEST 2008 Chris Lalancette <clalance@redhat.com> Thu Oct 16 17:02:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
* Add support for detecting the partition table type when scanning * Add support for detecting the partition table type when scanning
iSCSI volumes. This is implemented in the iSCSI volumes. This is implemented in the

View File

@ -466,8 +466,12 @@ m4-check:
&& { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \ && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \
exit 1; } || : exit 1; } || :
fix_po_file_diag = \
'you have changed the set of files with translatable diagnostics;\n\
apply the above patch\n'
# Verify that all source files using _() are listed in po/POTFILES.in. # Verify that all source files using _() are listed in po/POTFILES.in.
# FIXME: don't hard-code file names below; use a more general mechanism. po_file = po/POTFILES.in
po-check: po-check:
@if test -f po/POTFILES.in; then \ @if test -f po/POTFILES.in; then \
grep -E -v '^(#|$$)' po/POTFILES.in \ grep -E -v '^(#|$$)' po/POTFILES.in \
@ -488,7 +492,8 @@ po-check:
done; \ done; \
grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \ grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \
| sort -u > $@-2; \ | sort -u > $@-2; \
diff -u $@-1 $@-2 || exit 1; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
|| { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
rm -f $@-1 $@-2; \ rm -f $@-1 $@-2; \
fi fi