projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add make up and make update (update the working copy).
[platal.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
26f294e
..
1fa6d71
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-40,6
+40,10
@@
q:
%: %.in Makefile ChangeLog
sed -e 's,@VERSION@,$(VERSION),g' $< > $@
%: %.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
################################################################################
# targets
@@
-55,9
+59,9
@@
core:
## conf
##
## 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 $@
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: 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