web commit by http://madduck.myopenid.com/: poll vote (Accept only OpenID for logins)

[git.ikiwiki.info.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 2d34c6fe8f65155976b594a33a45abced9084340..52e702e47932c41f5f61cb34f274d32dd5ced0e9 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -15,11 +15,13 @@ 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 $(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 $@ $<
@@ -27,9 +29,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; \