Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 97fc0bca9bf3ce5da9ec309565e3dad7a7b6043e..b71bb8b91bd1d2d68dce77fe2f2a44339ef3fd70 100644 (file)
--- 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:
@@ -81,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