X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=02e5c01360dac8de563e9574824a2caf71903b21;hb=03a5279f6c5b82ac6a14b2d9cb995f0be4e2557c;hp=1570e142e403a9e12c77aefd6f079b74522cbcf3;hpb=91f37c81c3af78615c566acc7490120ed06f7bbd;p=platal.git

diff --git a/Makefile b/Makefile
index 1570e14..02e5c01 100644
--- a/Makefile
+++ b/Makefile
@@ -42,16 +42,19 @@ spool/wiki.d:
 	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
@@ -69,8 +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/wikipub
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################