X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=7b780d0b5f40848ac4db5a75a2000af2ea54c7db;hb=7b14a2a019713bcd39650c7631031a26f70ee4c2;hp=02e5c01360dac8de563e9574824a2caf71903b21;hpb=c70673d008d99b88632cea9e2c4ddf26000a9f4f;p=platal.git

diff --git a/Makefile b/Makefile
index 02e5c01..7b780d0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 ################################################################################
 # definitions
 
-VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//")
+VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//;s/ .*//")
 
 PKG_NAME = platal
 PKG_DIST = $(PKG_NAME)-$(VERSION)
@@ -16,13 +16,7 @@ VCS_FILTER = ! -name .arch-ids ! -name CVS
 
 all: build
 
-devel: build htdocs/valid.html
-
-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 banana
 
 clean:
 	rm -rf include/platal/globals.inc.php
@@ -45,11 +39,6 @@ spool/wiki.d:
 wiki/cookbook/e-protect.php:
 	cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
 
-htdocs/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
 
@@ -65,19 +54,23 @@ wiki/pub/skins/empty:
 get-wiki:
 	@if ! test -d wiki; then                                          \
 	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
-	    echo "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯"; \
-	    echo "now please untar pmwiki into wiki/ and run make again"; \
-	    echo "_____________________________________________________"; \
-	    exit 1;                                                       \
+	    tar -xzvf pmwiki-latest.tgz;				  \
+	    rm pmwiki-latest.tgz;					  \
+	    mv pmwiki-* wiki;						  \
 	fi
 
+banana: htdocs/images/banana htdocs/css/banana.css
+htdocs/images/banana:
+	cd $(@D) && ln -sf /usr/share/banana/img $(@F)
+
+htdocs/css/banana.css:
+	cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F)
+
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
-	@sed -e 's/^exit;/\/\/exit;/g' wiki/pmwiki.php > wiki/pmwiki.php.new
-	@mv wiki/pmwiki.php.new wiki/pmwiki.php
 
 wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################
 
-.PHONY: build dist clean wiki build-wiki
+.PHONY: build dist clean wiki build-wiki banana