From d0804acdc2974541bdb15558adf26f2d3dc81818 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 20 Feb 2007 23:13:49 +0000 Subject: * Smarter detection of no-op changes to po files. --- po/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'po/Makefile') diff --git a/po/Makefile b/po/Makefile index cc931c5a8..52e702e47 100644 --- a/po/Makefile +++ b/po/Makefile @@ -29,9 +29,9 @@ clean: %.po: ikiwiki.pot @echo -n "Merging ikiwiki.pot and $@" @msgmerge $@ ikiwiki.pot -o $@.new 2>&1 -# Typically all that changes was a date. I'd prefer not to commit such -# changes, so detect and ignore them. - @if [ "`diff $@ $@.new | grep '[<>]' | wc -l`" -ne 2 ]; then \ +# Typically all that changes was a date or line number. I'd prefer not to +# commit such changes, so detect and ignore them. + @if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \ mv -f $@.new $@; \ else \ rm -f $@.new; \ -- cgit v1.2.3