X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=02e5c01360dac8de563e9574824a2caf71903b21;hb=e54098b81963bf5be70765196d867ac18369bd14;hp=2a23b2ab821de505a12f73a53bc4e75330a6e1dc;hpb=43f637a6845bd3d70c8a7717bdd1ac62c9cae16b;p=platal.git

diff --git a/Makefile b/Makefile
index 2a23b2a..02e5c01 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;      \
@@ -67,6 +72,10 @@ get-wiki:
 	fi
 
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
+	@sed -e 's/^exit;/\/\/exit;/g' wiki/pmwiki.php > wiki/pmwiki.php.new
+	@mv wiki/pmwiki.php.new wiki/pmwiki.php
+
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################