diff options
| -rw-r--r-- | Makefile.example | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.example b/Makefile.example index 43b1fda..ec1c827 100644 --- a/Makefile.example +++ b/Makefile.example @@ -37,8 +37,7 @@ help: @echo ' make publish generate using production settings ' @echo ' make serve [PORT=8000] serve site at http://localhost:8000 ' @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 ' - @echo ' make devserver [PORT=8000] start/restart develop_server.sh ' - @echo ' make stopserver stop local server ' + @echo ' make devserver [PORT=8000] serve and regenerate together ' @echo ' make ssh_upload upload the web site via SSH ' @echo ' make rsync_upload upload the web site via rsync+ssh ' @echo ' make ftp_upload upload the web site via FTP ' @@ -61,24 +60,23 @@ regenerate: serve: ifdef PORT - cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT) + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) else - cd $(OUTPUTDIR) && $(PY) -m pelican.server + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) endif serve-global: ifdef SERVER - cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER) + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER) else - cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0 + $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0 endif - devserver: ifdef PORT - $(BASEDIR)/develop_server.sh restart $(PORT) + $(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) else - $(BASEDIR)/develop_server.sh restart + $(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) endif vendor: @@ -105,4 +103,4 @@ ftp_upload: publish validate: publish html5validator --root $(OUTPUTDIR) || html5validator -l --root $(OUTPUTDIR) -.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github +.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload ftp_upload |