commit 3c6a2e63b9a7fc03cea6346dde04c105674213a8
author Luigi Santivetti <luigi.santivetti@gmail.com> Tue Oct 06 21:02:34 2020 +0100
committer Luigi Santivetti <luigi.santivetti@gmail.com> Wed Oct 07 11:17:49 2020 +0100
tree 01663fa6eb205018512a1b5c874a685150f5b30b
parent 1782b6172c85c9fea3bfb65b350eaa88df5684b1

contents: move all contents

Makefile

diff --git a/Makefile b/Makefile
index daa6b60..5d8677e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,18 @@
 PELICANOPTS=
 
 BASEDIR=$(CURDIR)
-INPUTDIR=$(BASEDIR)/content
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
 OUTPUTDIR=$(BASEDIR)/output
 OUTPUTDIR_THEME=$(OUTPUTDIR)/theme
 OUTPUTDIR_PHOTOS=$(OUTPUTDIR)/photos
 OUTPUTDIR_VIDEOS=$(OUTPUTDIR)/videos
-CONFFILE=$(BASEDIR)/pelicanconf.py
-PUBLISHCONF=$(BASEDIR)/publishconf.py
+
+ifeq ($(PELICAN_CONTENT),)
+ INPUTDIR=$(BASEDIR)/content
+else
+ INPUTDIR=$(PELICAN_CONTENT)
+endif
 
 FTP_HOST=localhost
 FTP_USER=anonymous