X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=eed1687a76008e3ee70337aa3d22c7de829282fc;hb=e2cea47d18a6c2f1449e220c90103181229e939f;hp=e8abfa647924764bd8f666ec33c298fc79058ac0;hpb=63528107273f1f5de8a83428dbdd70e5f25d3d7f;p=platal.git

diff --git a/Makefile b/Makefile
index e8abfa6..eed1687 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
+
 # $Id: Makefile,v 1.5 2004/11/25 20:18:39 x99laine Exp $
 ################################################################################
 # 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)
@@ -16,13 +21,13 @@ VCS_FILTER = ! -name .arch-ids ! -name CVS
 
 all: build
 
-build: core banana wiki
+build: core banana wiki jquery
 
 q:
 	@echo -e "Code statistics\n"
 	@sloccount $(filter-out wiki/ spool/, $(wildcard */)) 2> /dev/null | egrep '^[a-z]*:'
 
-%: %.in Makefile
+%: %.in Makefile ChangeLog
 	sed -e 's,@VERSION@,$(VERSION),g' $< > $@
 
 ################################################################################
@@ -32,12 +37,16 @@ q:
 ## core
 ##
 
-core: spool/templates_c include/platal/globals.inc.php
+core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
 
-spool/templates_c spool/uploads:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
 	mkdir -p $@
 	chmod o+w $@
 
+htdocs/.htaccess: htdocs/.htaccess.in Makefile
+	@REWRITE_BASE="/~$$(id -un)"; \
+	test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
+	sed -e "s,@REWRITE_BASE@,$$REWRITE_BASE,g" $< > $@
 
 ##
 ## wiki
@@ -55,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:
@@ -65,17 +74,17 @@ htdocs/wiki:
 spool/wiki.d:
 	mkdir -p $@
 	chmod o+w $@
-	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+	cd $@ && ln -sf ../../include/wiki/wiki.d/* .
 
 
 wiki/cookbook/e-protect.php:
-	cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
+	cd wiki/cookbook && ln -sf ../../include/wiki/e-protect.php
 
 wiki/local/farmconfig.php:
-	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
+	cd wiki/local/ && ln -sf ../../include/wiki/farmconfig.php
 
 wiki/pub/skins/empty:
-	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
+	cd wiki/pub/skins/ && ln -sf ../../../include/wiki/empty
 
 
 get-wiki:
@@ -90,14 +99,27 @@ 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
+##
+
+jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
+htdocs/javascript/jquery.js:
+	wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
 
 ################################################################################
 
-.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