diff options
| author | Joey Hess <joey@kitenet.net> | 2012-04-27 14:22:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-27 14:22:39 -0400 |
| commit | f3821f161badc9f8dd2cf4eac70bbb28a0d1722f (patch) | |
| tree | ac2ec84ea64efb12d0e03b71732b7b6ce4e4adc7 | |
| parent | b485dbd891a129a23961a51b9d08d766d3b13726 (diff) | |
| download | ikiwiki-f3821f161badc9f8dd2cf4eac70bbb28a0d1722f.tar ikiwiki-f3821f161badc9f8dd2cf4eac70bbb28a0d1722f.tar.gz | |
work without gettext commands
Seems in certian cases (which I cannot entirely reproduce), gettext
commands run during build even from a clean tree. Make these nonfatal.
| -rw-r--r-- | po/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/po/Makefile b/po/Makefile index dfb018c81..97fc0bca9 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 $@; \ - else \ - rm -f $@.new; \ + @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then + echo "unable to run msgmerge"; \ + else; \ + 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 \ |