Update Makefile:

* Add .htaccess in uploads/temps/
* Update banana build (since it is not packaged anymore)
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/Makefile b/Makefile
index b175f5c..e0480fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@
 
 VERSNUM := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/ .*//")
 VERSTAG := $(shell grep VERSION ChangeLog | head -1 | grep 'XX' > /dev/null 2> /dev/null && echo 'beta')
+BANANA  := $(shell ( [ -d ../banana ] && echo `pwd`"/../banana" ) || echo "/home/web/dev/banana")
+
 VERSION = $(VERSNUM)$(VERSTAG)
 
 PKG_NAME = platal
@@ -37,10 +39,14 @@ q:
 
 core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
 
-spool/templates_c spool/mails_c spool/uploads spool/conf:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/uploads/temp:
        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="/"; \
@@ -62,7 +68,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads
+htdocs/uploads: spool/uploads/temp/.htaccess
        cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -97,12 +103,17 @@ get-wiki:
 ## banana
 ##
 
-banana: htdocs/images/banana htdocs/css/banana.css
+banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
 htdocs/images/banana:
-       cd $(@D) && ln -sf /usr/share/banana/img $(@F)
+       cd $(@D) && ln -sf $(BANANA)/img $(@F)
 
 htdocs/css/banana.css:
-       cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F)
+       cd $(@D) && ln -sf $(BANANA)/css/style.css $(@F)
+
+include/banana/banana.inc.php:
+       cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -sf {} . ";"
+
+
 
 ##
 ## jquery

diff --git a/include/banana/.gitignore b/include/banana/.gitignore
index 14814fd..7e05a01 100644 (file)
--- a/include/banana/.gitignore
+++ b/include/banana/.gitignore
@@ -11,4 +11,5 @@
 /protocoleinterface.inc.php
 /spool.inc.php
 /text.func.inc.php
+/tree.inc.php