git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ea5566
)
minor tweaks
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 21 Sep 2013 07:26:52 +0000
(09:26 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 21 Sep 2013 07:26:52 +0000
(09:26 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
4993548
..
2e8fdec
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,14
+2,13
@@
SHELL = /bin/bash
MAKE-SILENT = $(MAKE) --no-print-directory
MAKE-SILENT = $(MAKE) --no-print-directory
-### first purpose, build and install from setup.py
-all: build
-
-force:
+all: static templates
# clean up and recompute
redo: redo-static redo-templates
# clean up and recompute
redo: redo-static redo-templates
+force:
+
DESTDIR := /
datadir := /usr/share
bindir := /usr/bin
DESTDIR := /
datadir := /usr/share
bindir := /usr/bin
@@
-26,10
+25,14
@@
install:
--install-scripts=$(DESTDIR)/$(datadir)/unfold \
--install-data=$(DESTDIR)/$(datadir)/unfold
--install-scripts=$(DESTDIR)/$(datadir)/unfold \
--install-data=$(DESTDIR)/$(datadir)/unfold
-redo-static static: force
- rm -rf static/
+static: force
./manage.py collectstatic --noinput
./manage.py collectstatic --noinput
+clean-static:
+ rm -rf static/
+
+redo-static: clean-static static
+
####################
# general stuff
DATE=$(shell date -u +"%a, %d %b %Y %T")
####################
# general stuff
DATE=$(shell date -u +"%a, %d %b %Y %T")
@@
-131,7
+134,7
@@
debian.clean:
plugins-templates: force
@find plugins -type f -name '*.html'
local-templates: force
plugins-templates: force
@find plugins -type f -name '*.html'
local-templates: force
- @$(foreach tmpl,$(shell find . -name templates),ls -1 $(tmpl)/*;)
+ @$(foreach tmpl,$(shell find . -name templates
| grep -v '^\./templates$$'
),ls -1 $(tmpl)/*;)
list-templates: plugins-templates local-templates
list-templates: plugins-templates local-templates