Merge branch 'platal-0.9.16'

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 768d9ca..eed1687 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,11 @@
 ################################################################################
 # definitions
 
-VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//;s/ .*//")
+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
 PKG_DIST = $(PKG_NAME)-$(VERSION)
@@ -33,9 +37,9 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess
+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/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
        mkdir -p $@
        chmod o+w $@
 
@@ -60,7 +64,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads
+htdocs/uploads:
        cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -95,12 +99,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 -snf $(BANANA)/img $(@F)
 
 htdocs/css/banana.css:
-       cd $(@D) && ln -sf /usr/share/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 -snf {} . ";"
+
+
 
 ##
 ## jquery
@@ -112,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