summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-21 16:32:23 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-21 16:32:23 -0400
commit479f75abf41451a239cb0b9fa945469127e6df2d (patch)
treedcc89a5b13c02a556823416f5f0208d2ca9759e5
parent9cc6d6e4b8a22a37bb2d364042d527ddd906142d (diff)
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.
-rwxr-xr-xMakefile.PL2
-rwxr-xr-xdebian/rules1
-rw-r--r--po/Makefile6
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL
index ba437e3f6..7cde00880 100755
--- 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 af33131d9..2af69a5f7 100755
--- 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 52e702e47..013cdf268 100644
--- 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