From 4b934dbdd70bc52441677a5615ffb982fb0f5ca1 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 21 Sep 2013 09:26:52 +0200 Subject: [PATCH] minor tweaks --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 49935483..2e8fdecf 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,13 @@ SHELL = /bin/bash 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 +force: + DESTDIR := / datadir := /usr/share bindir := /usr/bin @@ -26,10 +25,14 @@ install: --install-scripts=$(DESTDIR)/$(datadir)/unfold \ --install-data=$(DESTDIR)/$(datadir)/unfold -redo-static static: force - rm -rf static/ +static: force ./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") @@ -131,7 +134,7 @@ debian.clean: 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 -- 2.43.0