X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=6227ed509b218b29a13666a872f9fe427ca7ed85;hb=9306cf4832f016081190f7b9cd066b63a4168331;hp=26b73521753ecab5e4cf57776f23300865ed0716;hpb=7faf6e6a278ad1f42345d53bf2a0691ca0da9691;p=platal.git

diff --git a/Makefile b/Makefile
index 26b7352..6227ed5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ headers:
 	headache -c install.d/platal-dev/templates/header.conf -h install.d/platal-dev/templates/header \
 		`find templates -name '*.tpl' ! -path 'templates/xnet/skin.tpl' ! -path 'templates/skin/*.tpl' ! -name 'vcard.tpl' `
 
-build: spool/templates_c wiki
+build: spool/templates_c wiki include/platal/globals.inc.php
 
 clean:
 	rm -rf include/platal/globals.inc.php
@@ -32,33 +32,47 @@ 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 templates_c/valid.html
-	cd htdocs && ln -sf ../templates_c/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/pmwiki.config.php:
-	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php
+wiki/local/farmconfig.php:
+	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
 
 wiki/pub/skins/empty:
 	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
 
-wiki: build-wiki spool/uploads htdocs/uploads htdocs/wikipub
-	@test -d wiki || wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz
+get-wiki:
+	@if ! test -d wiki; then                                          \
+	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
+	    tar -xzvf pmwiki-latest.tgz;				  \
+	    rm pmwiki-latest.tgz;					  \
+	    mv pmwiki-* wiki;						  \
+	fi
 
-spool/wiki.d::
-	cd $@ && ln -s ../../install.d/wiki/wiki.d/* .
+build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
 
-build-wiki: wiki/local/pmwiki.config.php wiki/pub/skins/empty spool/wiki.d
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################