From: Jim Meyering <meyering@redhat.com>
Date: Sun, 20 Mar 2011 10:31:11 +0000 (+0100)
Subject: maint.mk: sort file names *after* new transformation
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36152fb50f3fbb0597793621cbfd10902ac4cf46;p=pspp

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.
---

diff --git a/ChangeLog b/ChangeLog
index 1b42d3c7b7..269cbf2436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-20  Jim Meyering  <meyering@redhat.com>
+
+	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  <meyering@redhat.com>
 
 	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;						\