From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 5 May 2012 09:40:25 +0000 (+0200)
Subject: Fix po Makefile
X-Git-Tag: 3.20120516~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ac908010f359d0bec5d317d419c4cb6e6c86f52a

Fix po Makefile

In the complex 'if' chain when merging ikiwiki.pot with .po files, make
sure line-endings, shell-muting and semi-colons don't cause the shell to
bomb out with syntax errors and commands not found.
---

diff --git a/po/Makefile b/po/Makefile
index 97fc0bca9..45c91c9ae 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -47,15 +47,15 @@ clean:
 	@echo -n "Merging ikiwiki.pot and $@"
 # Typically all that changes is a date or line number. I'd prefer not to
 # commit such changes, so detect and ignore them.
-	@if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then
+	@if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
 		echo "unable to run msgmerge"; \
-	else; \
+	else \
 		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 \
 	fi
 
 check: