X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..376944cb026945ab597db01eb1e3aea4fa320007:/po/Makefile?ds=sidebyside

diff --git a/po/Makefile b/po/Makefile
index fa129de81..52e702e47 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -15,26 +15,28 @@ install: all
 	done
 
 ikiwiki.pot: $(POTFILES)
-	@echo "Rebuilding the pot file"
-	xgettext $(POTFILES) -o ikiwiki.pot -Lperl
+	@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; \
+	fi
 
 clean:
-	rm -f ikiwiki.pot $(MOFILES) messages messages.mo
+	rm -f $(MOFILES) messages messages.mo
 
 %.mo: %.po
 	msgfmt -o $@ $<
 
 %.po: ikiwiki.pot
 	@echo -n "Merging ikiwiki.pot and $@"
-	@msgmerge $@ ikiwiki.pot -o $@.new
-# 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 \
+	@msgmerge $@ ikiwiki.pot -o $@.new 2>&1
+# 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; \
 	fi
-	@msgfmt --statistics $@
+	@msgfmt --statistics $@ 2>&1
 
 check:
 	@for file in $(POFILES); do \