urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Giuseppe Bilotta 2012-05-05 11:40:25 +02:00 committed by Joey Hess
parent a98d96eca0
commit ac908010f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
po/Makefile
View File

@ -47,15 +47,15 @@ clean:
@echo -n "Merging ikiwiki.pot and $@" @echo -n "Merging ikiwiki.pot and $@"
# Typically all that changes is 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. # 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"; \ echo "unable to run msgmerge"; \
else; \ else \
if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \ if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
mv -f $@.new $@; \ mv -f $@.new $@; \
else \ else \
rm -f $@.new; \ rm -f $@.new; \
fi fi; \
@msgfmt --statistics $@ 2>&1 msgfmt --statistics $@ 2>&1 \
fi fi
check: check: