defer po and pot file updating until package build time

This allows make to be run without polluting the tree with lots of po file
changes.

diff --git a/Makefile.PL b/Makefile.PL
index ba437e3f656175908fe4d565b587569ed2a7bc7a..7cde00880b0d1b273a68e044e84a782b3a49901c 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -37,7 +37,7 @@ extra_build: ikiwiki.out
        ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
        ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
-       $(MAKE) -C po
+       $(MAKE) -C po mo
 
 extra_clean:
        rm -rf html doc/.ikiwiki

diff --git a/debian/rules b/debian/rules
index af33131d9b92554414e67258a2aa397374ef5ce3..2af69a5f793753418b8a31a4e6376ccb41479f90 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ build: build-stamp
 build-stamp:
        dh_testdir
        perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
+       $(MAKE) -C po
        $(MAKE)
        $(MAKE) test
        touch build-stamp

diff --git a/po/Makefile b/po/Makefile
index 52e702e47932c41f5f61cb34f274d32dd5ced0e9..013cdf26834e9f8679b82ae9e7252b56cff9f6fc 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,7 +5,9 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot $(MOFILES)
+all: ikiwiki.pot mo
+
+mo: $(MOFILES)
 
 install: all
        for file in $(MOFILES); do \
@@ -26,7 +28,7 @@ clean:
 %.mo: %.po
        msgfmt -o $@ $<
 
-%.po: ikiwiki.pot
+%.po:
        @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