X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=b175f5c0b0c19b413f3bf80637eff35458a89f37;hb=b9ad087851ce4a09236f64f67d15fdaf29e38cf0;hp=3859605703f49052f3be49bfa25384ad4f455aa6;hpb=baa8a5945e29594a3678ce446a643e6a9b56fd93;p=platal.git

diff --git a/Makefile b/Makefile
index 3859605..b175f5c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@
 ################################################################################
 # 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')
+VERSION = $(VERSNUM)$(VERSTAG)
 
 PKG_NAME = platal
 PKG_DIST = $(PKG_NAME)-$(VERSION)
@@ -33,9 +35,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/templates_c spool/mails_c spool/uploads:
+spool/templates_c spool/mails_c spool/uploads spool/conf:
 	mkdir -p $@
 	chmod o+w $@
 
@@ -108,7 +110,7 @@ htdocs/css/banana.css:
 
 jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
 htdocs/javascript/jquery.js:
-	wget http://jquery.com/src/jquery-latest.pack.js -O htdocs/javascript/jquery.js -q
+	wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
 
 ################################################################################