X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49761c1f047693dd9ac283ad4d3ff75eeee65ae0..0e278c4a848e0b3ddc0162db9dc135e791bd9477:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index 69aba722b..5ec4a157c 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,7 +5,10 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot mo ../underlays/locale
+# Translated underlays can only be generated if po4a is available.
+TRANSLATED_UNDERLAYS=$(shell if perl -e 'use Locale::Po4a::Common' 2>/dev/null; then echo ../underlays/locale; fi)
+
+all: ikiwiki.pot mo $(TRANSLATED_UNDERLAYS)
 
 mo: $(MOFILES)
 
@@ -20,8 +23,8 @@ install: all
 	# Underlay translation via po files that go in special per-language
 	# underlays.
 	for file in `cd underlays && find . -type f -name \*.po`; do \
-		lang=`echo $file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
-		dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang"`; \
+		lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
+		dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
 		install -d $$dir; \
 		install -m 0644 underlays/$$file $$dir; \
 	done
@@ -34,23 +37,26 @@ ikiwiki.pot: $(POTFILES)
 
 clean:
 	rm -f $(MOFILES) messages messages.mo *_stamp
-	rm -rf html underlays/.ikiwiki ../underlays/locale
+	rm -rf html underlays/.ikiwiki $(TRANSLATED_UNDERLAYS)
 	find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f
 
 %.mo: %.po
-	msgfmt -o $@ $<
+	@if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi
 
 %.po: ikiwiki.pot
 	@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
+# Typically all that changes is 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 $@; \
+	@if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
+		echo "unable to run msgmerge"; \
 	else \
-		rm -f $@.new; \
+		if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
+			mv -f $@.new $@; \
+		else \
+			rm -f $@.new; \
+		fi; \
+		msgfmt --statistics $@ 2>&1; \
 	fi
-	@msgfmt --statistics $@ 2>&1
 
 check:
 	@for file in $(POFILES); do \
@@ -83,7 +89,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp
 ../Makefile: ../Makefile.PL
 	cd .. && ./Makefile.PL
 
-../underlays/locale: po2wiki_stamp
+$(TRANSLATED_UNDERLAYS): po2wiki_stamp
 po2wiki_stamp: po2wiki underlays_copy_stamp
 	PERL5LIB=.. ./po2wiki underlay.setup
 	touch $@