X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=1fa6d713a602db323db44efecd3719576455367b;hb=2d81f9c4fbd732c3b5ae2dcbcf62aa3b28f44e0e;hp=26f294edc0eea77ce845b279b59015ef1f48ee89;hpb=9f52839d4a55c6b59ab80af35026a064e007ac72;p=platal.git

diff --git a/Makefile b/Makefile
index 26f294e..1fa6d71 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,10 @@ q:
 %: %.in Makefile ChangeLog
 	sed -e 's,@VERSION@,$(VERSION),g' $< > $@
 
+up: update
+update:
+	@git fetch && git rebase `git symbolic-ref HEAD | sed -e 's~refs/heads/~origin/~'` && git submodule update
+
 ################################################################################
 # targets
 
@@ -55,9 +59,9 @@ core:
 ## conf
 ##
 
-conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
+conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp spool/banana
 
-spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp spool/run:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp spool/run spool/banana:
 	mkdir -p $@
 	chmod o+w $@
 
@@ -243,3 +247,4 @@ restart-listrpc: stop-listrpc start-listrpc
 .PHONY: wiki build-wiki
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
+.PHONY: up update