summaryrefslogtreecommitdiff
path: root/po/Makefile
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 23:13:49 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 23:13:49 +0000
commitd0804acdc2974541bdb15558adf26f2d3dc81818 (patch)
treef9fa611ea6332069abbcc46f8d886732c8eb0ac0 /po/Makefile
parent99947c04cd800d8fdb03f7066130d2e4e9d8c4ae (diff)
* Smarter detection of no-op changes to po files.
Diffstat (limited to 'po/Makefile')
-rw-r--r--po/Makefile6
1 files changed, 3 insertions, 3 deletions
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; \