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.
master
Joey Hess 2012-04-27 14:22:39 -04:00
parent b485dbd891
commit f3821f161b
1 changed files with 11 additions and 8 deletions

View File

@ -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 \
@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
check:
@for file in $(POFILES); do \