X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=po%2FMakefile;h=cc4a062d59924ed722e7d6cc10259720ae1117ca;hb=e289b3f481be490065d59067918eabae6a180b47;hp=4e043eb320c8079b26c2a892a9d94559b8a74193;hpb=4e31e13244be1694c3725a8e463ad0494635ef30;p=dgit.git

diff --git a/po/Makefile b/po/Makefile
index 4e043eb3..cc4a062d 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -42,12 +42,7 @@
 
 all: messages.pot mofiles
 
-e=set -e; exec >$@.tmp
-f=mv -f $@.tmp $@
-o= >$@.tmp && $f
-
-S=@
-# Set S='' to see commands being run
+include ../i18n-common.make
 
 .%.potfiles:
 	$S $e; echo ../$*; $f
@@ -61,9 +56,6 @@ S=@
 	 sed "s#^#.$*.pot: #" $<; \
 	$f
 
-#	 echo 'MOS_$$(addsuffix'
-#	 find -name $*.mo |sed ; $f
-
 -include .dgit.make
 -include .git-debrebase.make
 -include .common.make
@@ -84,7 +76,7 @@ messages.pot: $(if $(SUPPRESS_PO_UPDATE),,$(POTS))
 %.mo: %.po
 	$S msgfmt -o $@ $<
 
-XGETTEXT_OPTS += -Lperl -k__ -k___
+XGETTEXT_OPTS += -Lperl -k__ -kf_ -ki_
 XGETTEXT_OPTS += --from-code=UTF-8
 XGETTEXT_OPTS += --package-name=dgit --package-version=ongoing
 # The --package-* avoids this error from make check's `msgfmt -c'
@@ -121,9 +113,11 @@ clean:
 
 .PRECIOUS: .%.potfiles
 
-all-po: $(POFILES)
+pofiles: $(POFILES)
+
+update: pofiles check
 
-check: $(if $(SUPPRESS_PO_UPDATE),,all-po)
+check: $(if $(SUPPRESS_PO_UPDATE),,pofiles)
 	$S set -e; for file in $(POFILES); do \
 		lang=`echo $$file | sed 's/\.po//'`; \
 		printf "$$lang: "; \