aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2012-05-05 11:40:25 +0200
committerJoey Hess <joey@kitenet.net>2012-05-05 08:12:06 -0400
commitac908010f359d0bec5d317d419c4cb6e6c86f52a (patch)
tree0ccdd990a437c1c0b37801cef57b705c6180bf69
parenta98d96eca06d88184dbf53afb256023300971f9d (diff)
downloadikiwiki-ac908010f359d0bec5d317d419c4cb6e6c86f52a.tar
ikiwiki-ac908010f359d0bec5d317d419c4cb6e6c86f52a.tar.gz
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.
-rw-r--r--po/Makefile8
1 files changed, 4 insertions, 4 deletions
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: