X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=408fd4e8665ad1f0d672425adbdc6e208a1dd3be;hb=ce6db91e5cad2cf7f32036d7a8770632bc054892;hp=4371c4389c2656265fc63a8717505e8a255137ed;hpb=4887dc9076011c9122c698866d71269cf52226fd;p=platal.git

diff --git a/Makefile b/Makefile
index 4371c43..408fd4e 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)
@@ -22,7 +22,7 @@ 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
 
 clean:
 	rm -rf include/platal/globals.inc.php
@@ -53,6 +53,9 @@ htdocs/valid.html:
 htdocs/uploads:
 	cd htdocs && ln -sf ../spool/uploads
 
+htdocs/img:
+	cd htdocs && ln -sf /usr/share/banana/img
+
 htdocs/wiki:
 	cd htdocs && ln -sf ../wiki/pub wiki
 
@@ -65,10 +68,9 @@ 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
 
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d