Merge commit 'fae59b07b02dbcaba892e96ff86f3f800e6ef54a' into sipb

[ikiwiki.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 013cdf26834e9f8679b82ae9e7252b56cff9f6fc..961763d058b42b9b65dd66967d4cc71ec3b8899c 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,6 +1,6 @@
 # List here all source files with translatable strings.
 POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
-       ../ikiwiki.in ../IkiWiki.pm
+       ../ikiwiki.in ../IkiWiki.pm ../auto.setup
 
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
@@ -19,26 +19,29 @@ install: all
 ikiwiki.pot: $(POTFILES)
        @if perl -e '($$ver)=`xgettext -V | head -n 1`=~/.*\s+([0-9]+\.[0-9]+)/; die "gettext $$ver too old, not updating the pot file\n" if $$ver < 0.16'; then \
                echo "Rebuilding the pot file"; \
-               xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
+               xgettext --from-code=UTF-8 $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
        fi
 
 clean:
        rm -f $(MOFILES) messages messages.mo
 
 %.mo: %.po
-       msgfmt -o $@ $<
+       @if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi
 
-%.po:
+%.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 \