X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6793d0e2f5adbc2da0ebfca1b5730e67d09e87f6..3d23c87a2e06d4a3e37c836a1c416db11908556d:/po/Makefile diff --git a/po/Makefile b/po/Makefile index dfb018c81..5ec4a157c 100644 --- a/po/Makefile +++ b/po/Makefile @@ -41,19 +41,22 @@ clean: find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f %.mo: %.po - msgfmt -o $@ $< + @if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi %.po: ikiwiki.pot @echo -n "Merging ikiwiki.pot and $@" - @msgmerge $@ ikiwiki.pot -o $@.new 2>&1 -# Typically all that changes was a date or line number. I'd prefer not to +# Typically all that changes is 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 $@; \ + @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \ + echo "unable to run msgmerge"; \ else \ - rm -f $@.new; \ + if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \ + mv -f $@.new $@; \ + else \ + rm -f $@.new; \ + fi; \ + msgfmt --statistics $@ 2>&1; \ fi - @msgfmt --statistics $@ 2>&1 check: @for file in $(POFILES); do \