X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5430ca5f2da312dc84e104ae1a400a66ccd80bab..365e11783b741e459f4c1cb3595def5211442c2e:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index 20c0cb3a8..bd218c6e1 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)
 
@@ -19,9 +22,9 @@ 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"`; \
+	for file in `find underlays -type f -name \*.po | sed -e 's|^underlays/||'`; do \
+		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 \
@@ -74,10 +80,16 @@ underlays_copy_stamp:
 	install -d underlays/empty
 	touch $@
 
-underlays: underlays_copy_stamp
-	../ikiwiki.out -libdir .. -setup underlay.setup -refresh
+underlays: ../ikiwiki.out underlays_copy_stamp
+	../ikiwiki.out --libdir .. --setup underlay.setup --refresh
+
+../ikiwiki.out: ../Makefile
+	$(MAKE) -C .. ikiwiki.out
+
+../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 $@