Merge commit 'remotes/smcv/ready/inline-pagenames' into staging

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

diff --git a/po/Makefile b/po/Makefile
index 20c0cb3a80032b3d0f625e39fa81e129f7d69496..d67c3a4ffac84247dc033ba85baa2665ebdbf1ee 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -20,8 +20,8 @@ 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 \
-               lang=`echo $file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
-               dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang"`; \
+               lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
+               dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
                install -d $$dir; \
                install -m 0644 underlays/$$file $$dir; \
        done
@@ -74,9 +74,15 @@ underlays_copy_stamp:
        install -d underlays/empty
        touch $@
 
-underlays: underlays_copy_stamp
+underlays: ../ikiwiki.out underlays_copy_stamp
        ../ikiwiki.out -libdir .. -setup underlay.setup -refresh
 
+../ikiwiki.out: ../Makefile
+       make -C .. ikiwiki.out
+
+../Makefile: ../Makefile.PL
+       cd .. && ./Makefile.PL
+
 ../underlays/locale: po2wiki_stamp
 po2wiki_stamp: po2wiki underlays_copy_stamp
        PERL5LIB=.. ./po2wiki underlay.setup