X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/479f75abf41451a239cb0b9fa945469127e6df2d..0a046b842b997203c3b8ff646610ec181bc96e34:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index 013cdf268..961763d05 100644
--- 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 \