github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2706 from nikolausschueler/makefix

Browse source 
Handle case of missing port in target "serve-global"
This commit is contained in:
Justin Mayer 2020-03-25 09:03:00 +01:00 • committed by GitHub
commit a9a651ce4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pelican/tools/templates/Makefile.jinja2
View file

@ -50,6 +50,14 @@ ifeq ($(RELATIVE), 1)
PELICANOPTS += --relative-urls PELICANOPTS += --relative-urls
endif endif
SERVER ?= "0.0.0.0"
PORT ?= 0
ifneq ($(PORT), 0)
PELICANOPTS += -p $(PORT)
endif
help: help:
@echo 'Makefile for a pelican Web site ' @echo 'Makefile for a pelican Web site '
@echo ' ' @echo ' '
@ -100,12 +108,7 @@ else
endif endif
serve-global: serve-global:
ifdef SERVER $(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b $(SERVER)
$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
else
$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
endif
devserver: devserver:
ifdef PORT ifdef PORT