Mercurial > hg > octave-kai > gnulib-hg
changeset 14433:00046711b6a6
maint.mk: let po check work in VPATH build
* top/maint.mk (po_file): Allow cfg.mk override.
(sc_po_check): Allow VPATH use.
Reported by Jiri Denemark.
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Eric Blake <eblake@redhat.com> |
---|---|
date | Fri, 18 Mar 2011 15:32:24 -0600 |
parents | dcc1567d7f4e |
children | 7624b26aea3d |
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 @@ +2011-03-18 Eric Blake <eblake@redhat.com> + + maint.mk: let po check work in VPATH build + * top/maint.mk (po_file): Allow cfg.mk override. + (sc_po_check): Allow VPATH use. + Reported by Jiri Denemark. + 2011-03-16 Jim Meyering <meyering@redhat.com> maint.mk: allow fine-grained syntax-check exclusion via Make variables
--- a/top/maint.mk +++ b/top/maint.mk @@ -955,13 +955,13 @@ apply the above patch\n' # Verify that all source files using _() are listed in po/POTFILES.in. -po_file = po/POTFILES.in +po_file ?= $(srcdir)/po/POTFILES.in sc_po_check: @if test -f $(po_file); then \ grep -E -v '^(#|$$)' $(po_file) \ | grep -v '^src/false\.c$$' | sort > $@-1; \ files=; \ - for file in $$($(VC_LIST_EXCEPT)) lib/*.[ch]; do \ + for file in $$($(VC_LIST_EXCEPT)) $(srcdir)lib/*.[ch]; do \ test -r $$file || continue; \ case $$file in \ *.m4|*.mk) continue ;; \ @@ -976,7 +976,7 @@ files="$$files $$file"; \ done; \ grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \ - | sort -u > $@-2; \ + | sort -u | sed 's|^$(_dot_escaped_srcdir)/||' > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ rm -f $@-1 $@-2; \