X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=eed1687a76008e3ee70337aa3d22c7de829282fc;hb=e2cea47d18a6c2f1449e220c90103181229e939f;hp=e0480fa73f8b23d0994e6bff82157dbf32c028d6;hpb=5b677a86f55413c5a900fa4e91d2f6b9a335e100;p=platal.git

diff --git a/Makefile b/Makefile
index e0480fa..eed1687 100644
--- a/Makefile
+++ b/Makefile
@@ -37,16 +37,12 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
+core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
 
-spool/templates_c spool/mails_c spool/uploads spool/conf spool/uploads/temp:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
 	mkdir -p $@
 	chmod o+w $@
 
-spool/uploads/temp/.htaccess: spool/uploads/temp Makefile
-	echo "Order deny,allow" > $@
-	echo "Deny from all" >> $@
-
 htdocs/.htaccess: htdocs/.htaccess.in Makefile
 	@REWRITE_BASE="/~$$(id -un)"; \
 	test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
@@ -68,7 +64,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads/temp/.htaccess
+htdocs/uploads:
 	cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -105,13 +101,13 @@ get-wiki:
 
 banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
 htdocs/images/banana:
-	cd $(@D) && ln -sf $(BANANA)/img $(@F)
+	cd $(@D) && ln -snf $(BANANA)/img $(@F)
 
 htdocs/css/banana.css:
-	cd $(@D) && ln -sf $(BANANA)/css/style.css $(@F)
+	cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
 
 include/banana/banana.inc.php:
-	cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -sf {} . ";"
+	cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
 
 
 
@@ -125,5 +121,5 @@ htdocs/javascript/jquery.js:
 
 ################################################################################
 
-.PHONY: build dist clean wiki build-wiki banana
+.PHONY: build dist clean wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php