X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=4371c4389c2656265fc63a8717505e8a255137ed;hb=b6837fc41fc911aa340c673456812fd2112f68e3;hp=79b6191327b1d2712810ac12ad4f1e29dbee5893;hpb=796aea3473c82dd49f26d2b67c8dfde76677ff77;p=platal.git

diff --git a/Makefile b/Makefile
index 79b6191..4371c43 100644
--- a/Makefile
+++ b/Makefile
@@ -32,19 +32,29 @@ clean:
 
 ################################################################################
 # targets
-spool/templates_c spool/uploads spool/wiki.d::
+
+spool/templates_c spool/uploads:
 	mkdir -p $@
 	chmod o+w $@
 
+spool/wiki.d:
+	mkdir -p $@
+	chmod o+w $@
+	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+
+wiki/cookbook/e-protect.php:
+	cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
+
 htdocs/valid.html:
 	touch spool/templates_c/valid.html
+	chmod o+w spool/templates_c/valid.html
 	cd htdocs && ln -sf ../spool/templates_c/valid.html
 
 htdocs/uploads:
 	cd htdocs && ln -sf ../spool/uploads
 
-htdocs/wikipub:
-	cd htdocs && ln -sf ../wiki/pub wikipub
+htdocs/wiki:
+	cd htdocs && ln -sf ../wiki/pub wiki
 
 wiki/local/farmconfig.php:
 	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
@@ -52,11 +62,6 @@ wiki/local/farmconfig.php:
 wiki/pub/skins/empty:
 	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
 
-wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wikipub
-
-spool/wiki.d::
-	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
-
 get-wiki:
 	@if ! test -d wiki; then                                          \
 	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
@@ -66,7 +71,9 @@ get-wiki:
 	    exit 1;                                                       \
 	fi
 
-build-wiki: wiki/local/pmwiki.config.php wiki/pub/skins/empty spool/wiki.d
+build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
+
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################