X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f3821f161badc9f8dd2cf4eac70bbb28a0d1722f..b500d893f3f785ba380224a70e8e5f1515d5cdfa:/po/Makefile?ds=sidebyside diff --git a/po/Makefile b/po/Makefile index 97fc0bca9..4d1d33e83 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: @@ -84,7 +84,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp ../ikiwiki.out -libdir .. -setup underlay.setup -refresh ../ikiwiki.out: ../Makefile - make -C .. ikiwiki.out + $(MAKE) -C .. ikiwiki.out ../Makefile: ../Makefile.PL cd .. && ./Makefile.PL