fixes for Danish integration

[ikiwiki.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index cc931c5a8c9693dcd236084e49166a80171af4d4..01071237f901aad780aa024810c3b8b058f968a4 100644 (file)
--- 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 ../underlays/locale
+
+mo: $(MOFILES)
 
 install: all
        for file in $(MOFILES); do \
@@ -17,11 +19,13 @@ 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
+       rm -f $(MOFILES) messages messages.mo *_stamp
+       rm -rf html underlays/.ikiwiki ../underlays/locale
+       find underlays -name \*.mdwn | xargs rm -f
 
 %.mo: %.po
        msgfmt -o $@ $<
@@ -29,9 +33,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; \
@@ -44,3 +48,28 @@ check:
                printf "$$lang: "; \
                msgfmt -o /dev/null -c -v --statistics $$lang.po;\
        done
+
+underlays_copy_stamp:
+       # copy all the files we want to translate into a srcdir
+       for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
+               install -d $$(dirname $$file); \
+               cp -aL ../$$file $$file 2>/dev/null || \
+               install -m 644 ../$$file $$file; \
+       done
+       install -d underlays/directives/ikiwiki/directive
+       for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
+               cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
+               install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
+       done
+       install -d underlays/empty
+       touch $@
+
+underlays: underlays_copy_stamp
+       ../ikiwiki.out -libdir .. -setup underlay.setup -refresh
+
+../underlays/locale: po2wiki_stamp
+po2wiki_stamp: po2wiki underlays_copy_stamp
+       PERL5LIB=.. ./po2wiki underlay.setup
+       touch $@
+
+.PHONY: underlays