response

[ikiwiki.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index d094733b15a9030914372c36c3f27e4c02a4055f..5ec4a157c6ddbb0fdfcdea3d117730b3cb2ea266 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -37,23 +37,26 @@ ikiwiki.pot: $(POTFILES)
 
 clean:
        rm -f $(MOFILES) messages messages.mo *_stamp
-       rm -rf html underlays/.ikiwiki ../underlays/locale
+       rm -rf html underlays/.ikiwiki $(TRANSLATED_UNDERLAYS)
        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 \