X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f398ad035b973608d380c9939ea845d8e2a0cdc2..370d9abf6e2b6f3b4a7f18b21fdd8a310ced18e2:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index dfb018c81..bd218c6e1 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -22,7 +22,7 @@ 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 \
+	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; \
@@ -41,19 +41,22 @@ clean:
 	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 \
@@ -78,10 +81,10 @@ underlays_copy_stamp:
 	touch $@
 
 underlays: ../ikiwiki.out underlays_copy_stamp
-	../ikiwiki.out -libdir .. -setup underlay.setup -refresh
+	../ikiwiki.out --libdir .. --setup underlay.setup --refresh
 
 ../ikiwiki.out: ../Makefile
-	make -C .. ikiwiki.out
+	$(MAKE) -C .. ikiwiki.out
 
 ../Makefile: ../Makefile.PL
 	cd .. && ./Makefile.PL