X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=1d5123bc80fecd9de1ce3683dcf51381d3fb7b27;hb=2907d4014c8e6c437e0d9252b6a65dbaedf53212;hp=0a8a76381d6e3521697ddc278abc47fa4a270eaa;hpb=52165f0eb1fd65bf2e388fcc037389c29a60a0a2;p=platal.git

diff --git a/Makefile b/Makefile
index 0a8a763..1d5123b 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,8 @@ 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
@@ -63,15 +65,16 @@ wiki/pub/skins/empty:
 get-wiki:
 	@if ! test -d wiki; then                                          \
 	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
-	    echo "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯"; \
-	    echo "now please untar pmwiki into wiki/ and run make again"; \
-	    echo "_____________________________________________________"; \
-	    exit 1;                                                       \
+	    tar -xzvf pmwiki-latest.tgz;				  \
+	    rm pmwiki-latest.tgz;					  \
+	    mv pmwiki-* 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: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################