Fix admin/logger when the user has no entry in the aliases table.

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index a4e1773..1fa6d71 100644 (file)
--- 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 $@
 
@@ -213,6 +217,9 @@ $(JSTREE_PATH):
        mv -f spool/tmp/jstree/themes/default/style.css htdocs/css/jstree.css
        mv -f spool/tmp/jstree/themes/default/d.png htdocs/images/jstree.png
        mv -f spool/tmp/jstree/jquery.jstree.js htdocs/javascript/jquery.jstree-$(JSTREE_VERSION).js
+       sed -i -e 's/"d\.png"/"..\/images\/jstree.png"/' htdocs/css/jstree.css
+       sed -i -e 's/"throbber\.gif"/"..\/images\/wait.gif"/' htdocs/css/jstree.css
+       sed -i -e 's/#ffffee/inherit/' htdocs/css/jstree.css
        ln -snf jquery.jstree-$(JSTREE_VERSION).js htdocs/javascript/jquery.jstree.js
        rm -Rf spool/tmp/jstree
 
@@ -240,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