From 82c1628bf3149c484c9a88abe050430313eb2eb1 Mon Sep 17 00:00:00 2001 From: Julien Iguchi-Cartigny Date: Mon, 14 Oct 2013 10:10:38 +0200 Subject: [PATCH] fix #1116, pages are not generated in version 3.3.0 - declare default content directory to PATH in pelicanconf.py template - Removing references to INPUT_DIR from Makefile template --- pelican/tools/templates/Makefile.in | 7 +++---- pelican/tools/templates/pelicanconf.py.in | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in index 524bf82e..cc6a6fcb 100644 --- a/pelican/tools/templates/Makefile.in +++ b/pelican/tools/templates/Makefile.in @@ -2,7 +2,6 @@ PELICAN=$pelican PELICANOPTS=$pelicanopts BASEDIR=$$(CURDIR) -INPUTDIR=$$(BASEDIR)/content OUTPUTDIR=$$(BASEDIR)/output CONFFILE=$$(BASEDIR)/pelicanconf.py PUBLISHCONF=$$(BASEDIR)/publishconf.py @@ -52,13 +51,13 @@ help: @echo ' ' html: - $$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) + $$(PELICAN) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) clean: [ ! -d $$(OUTPUTDIR) ] || rm -rf $$(OUTPUTDIR) regenerate: - $$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) + $$(PELICAN) -r -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) serve: ifdef PORT @@ -80,7 +79,7 @@ stopserver: @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' publish: - $$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS) + $$(PELICAN) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS) ssh_upload: publish scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR) diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in index 5d96051d..00a7ec84 100644 --- a/pelican/tools/templates/pelicanconf.py.in +++ b/pelican/tools/templates/pelicanconf.py.in @@ -6,6 +6,8 @@ AUTHOR = $author SITENAME = $sitename SITEURL = '' +PATH = 'content' + TIMEZONE = 'Europe/Paris' DEFAULT_LANG = $lang