From dc214056449119b29ad7b19b8d47e81b343ff453 Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Sun, 28 Apr 2013 19:54:45 +0200 Subject: Updated theme and templates Updated to pelican 3.2 --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 824b521..8543c12 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ help: @echo ' make publish generate using production settings ' @echo ' make serve serve site at http://localhost:8000' @echo ' make devserver start/restart develop_server.sh ' + @echo ' make stopserver stop local server ' @echo ' ssh_upload upload the web site via SSH ' @echo ' rsync_upload upload the web site via rsync+ssh ' @echo ' dropbox_upload upload the web site via Dropbox ' @@ -43,17 +44,22 @@ $(OUTPUTDIR)/%.html: $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) clean: - find $(OUTPUTDIR) -mindepth 1 -delete + [ ! -d $(OUTPUTDIR) ] || find $(OUTPUTDIR) -mindepth 1 -delete regenerate: clean $(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) serve: - cd $(OUTPUTDIR) && python -m SimpleHTTPServer + cd $(OUTPUTDIR) && python -m pelican.server devserver: $(BASEDIR)/develop_server.sh restart +stopserver: + kill -9 `cat pelican.pid` + kill -9 `cat srv.pid` + @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' + publish: $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) -- cgit v1.2.3