X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d1636b63239ba9ee59d97454ff6fddf6b386fae8..8776c76e322b3e3d900ae9274820364cc590f4d7:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index a415854a2..c1c37443b 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,11 +1,13 @@
 # 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)
 
-all: ikiwiki.pot $(MOFILES)
+all: ikiwiki.pot mo
+
+mo: $(MOFILES)
 
 install: all
 	for file in $(MOFILES); do \
@@ -15,8 +17,10 @@ install: all
 	done
 
 ikiwiki.pot: $(POTFILES)
-	@echo "Rebuilding the pot file"
-	xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators
+	@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 --from-code=UTF-8 $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
+	fi
 
 clean:
 	rm -f $(MOFILES) messages messages.mo
@@ -27,9 +31,9 @@ clean:
 %.po: ikiwiki.pot
 	@echo -n "Merging ikiwiki.pot and $@"
 	@msgmerge $@ ikiwiki.pot -o $@.new 2>&1
-# Typically all that changes was a date. I'd prefer not to commit such
-# changes, so detect and ignore them.
-	@if [ "`diff $@ $@.new | grep '[<>]' | wc -l`" -ne 2 ]; then \
+# Typically all that changes was 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; \