update for rename of recentchanges.mdwn to json.tl.ph.mdwn

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

diff --git a/po/Makefile b/po/Makefile
index 97fc0bca9bf3ce5da9ec309565e3dad7a7b6043e..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.
        
        # 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; \
                lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
                dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
                install -d $$dir; \


@@ -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.
        @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"; \
                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; \
                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:
        fi
 
 check:


@@ -81,10 +81,10 @@ underlays_copy_stamp:
        touch $@
 
 underlays: ../ikiwiki.out 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
 
 ../ikiwiki.out: ../Makefile

-       make -C .. ikiwiki.out
+       $(MAKE) -C .. ikiwiki.out

 
 ../Makefile: ../Makefile.PL
        cd .. && ./Makefile.PL
 
 ../Makefile: ../Makefile.PL
        cd .. && ./Makefile.PL