4747 @echo ' make publish generate using production settings '
4848 @echo ' make serve [PORT=8000] serve site at http://localhost:8000'
4949 @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 '
50- @echo ' make devserver [PORT=8000] start/restart develop_server.sh '
51- @echo ' make stopserver stop local server '
50+ @echo ' make devserver [PORT=8000] start/restart local server '
5251 @echo ' make ssh_upload upload the web site via SSH '
5352 @echo ' make rsync_upload upload the web site via rsync+ssh '
5453 @echo ' make dropbox_upload upload the web site via Dropbox '
@@ -62,13 +61,13 @@ help:
6261 @echo ' '
6362
6463html :
65- $(PELICAN ) $(INPUTDIR ) -o $(OUTPUTDIR ) -s $(CONFFILE ) $(PELICANOPTS )
64+ $(PELICAN ) $(INPUTDIR ) --output $(OUTPUTDIR ) --settings $(CONFFILE ) $(PELICANOPTS )
6665
6766clean :
6867 [ ! -d $( OUTPUTDIR) ] || rm -rf $(OUTPUTDIR )
6968
7069regenerate :
71- $(PELICAN ) -r $(INPUTDIR ) -o $(OUTPUTDIR ) -s $(CONFFILE ) $(PELICANOPTS )
70+ $(PELICAN ) -r $(INPUTDIR ) --output $(OUTPUTDIR ) --settings $(CONFFILE ) $(PELICANOPTS )
7271
7372serve :
7473ifdef PORT
@@ -87,17 +86,13 @@ endif
8786
8887devserver :
8988ifdef PORT
90- $(BASEDIR)/develop_server.sh restart $(PORT)
89+ $(PELICAN) --autoreload --listen --port $(PORT)
9190else
92- $(BASEDIR)/develop_server.sh restart
91+ $(PELICAN) --autoreload --listen
9392endif
9493
95- stopserver :
96- $(BASEDIR ) /develop_server.sh stop
97- @echo ' Stopped Pelican and SimpleHTTPServer processes running in background.'
98-
9994publish :
100- $(PELICAN ) $(INPUTDIR ) -o $(OUTPUTDIR ) -s $(PUBLISHCONF ) $(PELICANOPTS )
95+ $(PELICAN ) $(INPUTDIR ) --output $(OUTPUTDIR ) --settings $(PUBLISHCONF ) $(PELICANOPTS )
10196 cp gh-pages-README.md $(OUTPUTDIR ) /README.md
10297
10398ssh_upload : publish
@@ -122,7 +117,7 @@ github: publish
122117 ghp-import -m " Generate Pelican site" -b $(GITHUB_PAGES_BRANCH ) $(OUTPUTDIR )
123118 git push origin $(GITHUB_PAGES_BRANCH )
124119
125- .PHONY : html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
120+ .PHONY : html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
126121
127122# Everything below here is custom to libgd.
128123
0 commit comments