From 36152fb50f3fbb0597793621cbfd10902ac4cf46 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 20 Mar 2011 11:31:11 +0100 Subject: [PATCH] maint.mk: sort file names *after* new transformation * top/maint.mk (sc_po_check): Sorting before removing the $(srcdir)/ prefix would have led to an unwarranted failure in GNU parted. Sort after that transformation. --- ChangeLog | 7 +++++++ top/maint.mk | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1b42d3c7b7..269cbf2436 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-20 Jim Meyering + + maint.mk: sort file names *after* new transformation + * top/maint.mk (sc_po_check): Sorting before removing the $(srcdir)/ + prefix would have led to an unwarranted failure in GNU parted. + Sort after that transformation. + 2011-03-19 Jim Meyering maint.mk: fix po-file syntax-check rule diff --git a/top/maint.mk b/top/maint.mk index fd192c97d7..3f7d983360 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -976,7 +976,7 @@ sc_po_check: files="$$files $$file"; \ done; \ grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \ - | sort -u | sed 's|^$(_dot_escaped_srcdir)/||' > $@-2; \ + | 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; }; \ rm -f $@-1 $@-2; \ -- 2.30.2