From 7ae5de5b009c74c3285f8858f03e2097f67881f6 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 8 Jul 2012 20:38:34 +0100 Subject: [PATCH] Fix 'make update-translations' not to remove file headers Signed-off-by: David Woodhouse --- Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe07cd0..7ab813c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,17 +110,18 @@ update-translations: po/$(PACKAGE).pot done && \ tx pull -af && \ for a in po/*.po; do \ - msgmerge -q -N -F $$a $(abs_builddir)/po/$(PACKAGE).pot | sed '0,/^#:/d' > $$a.new ; \ + msgmerge -q -N -F $$a $(abs_builddir)/po/$(PACKAGE).pot > $$a.new ; \ + sed '0,/^#:/d' $$a.new > $$a.new.cmp ; \ if ! git ls-tree --name-only HEAD $$a | grep -q $$a; then \ echo New file $$a ; \ git add $$a ; \ - elif ! diff -u $$a.old $$a.new; then \ + elif ! diff -u $$a.old $$a.new.cmp; then \ echo New changes for $$a; \ mv $$a.new $$a; \ else \ git checkout -f HEAD $$a ; \ fi ; \ - rm -f $$a.old $$a.new ; \ + rm -f $$a.old $$a.new $$a.new.cmp ; \ done && \ ls po/*.po | sed 's%^po/\(.*\)\.po%\1%' > po/LINGUAS ; \ if ! git update-index -q --refresh --unmerged || \ -- 2.7.4