add recent updates

[libreplanet-static.git] / 2017 / Makefile

diff --git a/2017/Makefile b/2017/Makefile
index b8de8dbced187364ecd8b54b24b8abf4c702fb3b..f49075be8c7022aaa8d107686cb8fe0ccb41265a 100644 (file)
--- a/2017/Makefile
+++ b/2017/Makefile
@@ -14,14 +14,12 @@
 #   along with this program.  If not, see
 #   <http://www.gnu.org/licenses/>.
 
-LP_YEAR = 2016
+LP_YEAR = 2017
 
-SPEAKERS_TEMPLATE = assets/templates/lp-speakers-2016.jinja2
-SPEAKERS_MD = /home/owner/brains/campaigns/libreplanet/2016/program/bios-for-site.mdwn
+SPEAKERS_MD = /home/owner/brains/campaigns/libreplanet/2017/program/bios-for-site.mdwn
 SPEAKERS_HTML = program/generated-bios.html
 
-SESSIONS_TEMPLATE = assets/templates/lp-sch-2016.jinja2
-SESSIONS_MD = /home/owner/brains/campaigns/libreplanet/2016/program/sessions-for-site.mdwn
+SESSIONS_MD = /home/owner/brains/campaigns/libreplanet/2017/program/sessions-for-site.mdwn
 SESSIONS_HTML = program/generated-sessions.html
 
 
@@ -43,11 +41,11 @@ both: $(SPEAKERS_HTML) $(SESSIONS_HTML)
 
 
 $(SPEAKERS_HTML): $(SPEAKERS_MD)
-       @lps_gen -sp $(SPEAKERS_TEMPLATE) $< > $@
+       @lps_gen -sp $< > $@
 
 
 $(SESSIONS_HTML): $(SESSIONS_MD)
-       @lps_gen -s --ical $(LP_YEAR) $(SESSIONS_TEMPLATE) $< > $@
+       @lps_gen -sc --ical $(LP_YEAR) $< > $@
 
 
 .PHONY:  all speakers sessions both clean