Merge branch 'master' into 'debian/master'

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

diff --git a/po/Makefile b/po/Makefile
index 45c91c9aece8d24fd790c02533dfecabe453f7d4..bd218c6e19352b02b77e5a0cedb32040077062dd 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -22,7 +22,7 @@ install: all
        
        # Underlay translation via po files that go in special per-language
        # underlays.
-       for file in `cd underlays && find . -type f -name \*.po`; do \
+       for file in `find underlays -type f -name \*.po | sed -e 's|^underlays/||'`; do \
                lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
                dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
                install -d $$dir; \
@@ -55,7 +55,7 @@ clean:
                else \
                        rm -f $@.new; \
                fi; \
-               msgfmt --statistics $@ 2>&1 \
+               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