summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorache <ache@ache.one>2017-08-20 21:05:10 +0200
committerache <ache@ache.one>2017-08-20 21:05:10 +0200
commitf0fe306cd4695f9086fb20011a26d80caedba4d3 (patch)
treef0cfc496a5b06171d6c932becc34fe3f5d260fa7
parentAjout de l'email en image (diff)
Implémente link canonical
-rw-r--r--headers.m42
-rw-r--r--index.m42
-rw-r--r--makefile22
3 files changed, 17 insertions, 9 deletions
diff --git a/headers.m4 b/headers.m4
index 210e300..bdd15a9 100644
--- a/headers.m4
+++ b/headers.m4
@@ -2,7 +2,7 @@
<meta charset="utf-8" />
<title>TITLE_TITLE</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="canonical" src="$canonic$"/>
+ <link rel="canonical" src="CANONIC"/>
<link rel="shortcut icon" type="image/svg" src="res/ache.ico" />
<style>@import url("/design/design.css");</style>
<meta name= "description" content="Site d'ache : Articles et présentation de mes projets" />
diff --git a/index.m4 b/index.m4
index cb65624..910b656 100644
--- a/index.m4
+++ b/index.m4
@@ -2,7 +2,7 @@
<html>
<!-- HEADERS -->
-include(headers.htm)
+include(headers_index.htm)
<body>
include(left.htm)
diff --git a/makefile b/makefile
index ee646c2..d37e116 100644
--- a/makefile
+++ b/makefile
@@ -25,15 +25,15 @@ bin/introFilter: src/introFilter.hs src/Id.hs
ghc -dynamic $< -isrc -outputdir /tmp/introFilter -o $@
-article/%.html: article/%.md bin/articleFilter $(BASE_HTML)
+article/%.html: article/%.md bin/articleFilter bin/titleFilter $(BASE_HTML)
pandoc --filter bin/articleFilter $< > ${@:.html=.htm}
m4 -D TITLE_TITLE="`pandoc --filter bin/titleFilter $<`" headers.m4 > ${basename $@}_header.html
- m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html article/article.m4 > $@
+ m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="//$@" article/article.m4 > $@
-contact/index.html: contact/index.md
+contact/index.html: contact/index.md bin/titleFilter
pandoc $< > ${@:.html=.htm}
m4 -D TITLE_TITLE="`pandoc --filter bin/titleFilter $<`" headers.m4 > ${basename $@}_header.html
- m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html article/article.m4 > $@
+ m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} -D HEADER_HEADER=${basename $@}_header.html -D CANONIC="//contact" article/article.m4 > $@
article/%_intro.html: article/%.md bin/introFilter
pandoc --filter bin/introFilter $< > ${@:.html=.htm}
@@ -42,9 +42,10 @@ article/%_intro.html: article/%.md bin/introFilter
articles.htm: $(ALL_ARTICLES_INTRO_OUT) bin/introFilter
cat $(ALL_ARTICLES_INTRO_OUT) > $@
+headers_index.htm:
+ m4 -D TITLE_TITLE="Licornes, hérissons et renards" -D CANONIC="//" headers.m4 > $@
-
-index.html: index.m4 $(BASE_HTML)
+index.html: index.m4 $(BASE_HTML) headers_index.htm
m4 $< > $@
left.htm: res/twitterLogo.svg res/mastoLogo.svg res/gitLogo.svg res/acheLogo.svg left.m4
@@ -58,12 +59,19 @@ clean:
rm -f articles.html
rm -f $(ALL_ARTICLES:.md=_intro.htm)
rm -f $(ALL_ARTICLES:.md=.htm)
+ rm -f article/*.htm
+ rm -f article/*_header.html
+ rm -f contact/*.htm
+ rm -f contact/*_header.html
+ rm -f headers_index.htm
-mrproper:
+mrproper: clean
rm -f bin/*
rm -f index.html
rm -f $(ALL_ARTICLES_OUT)
rm -f $(ALL_ARTICLES_INTRO_OUT)
+ rm -f contact/index.html
+