summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorache <ache@ache.one>2017-08-17 05:26:14 +0200
committerache <ache@ache.one>2017-08-17 05:26:14 +0200
commit17f2d30b5fda09f0c27898a81a5c4b92a5a8b53f (patch)
tree2c9c8edd79c4e6b0ccc3e23155d0aba5e87de4cb
parentNew website prototype (diff)
Quick fix of m4 file intro makefile
-rw-r--r--article/article.m42
-rw-r--r--article/intro.m42
-rw-r--r--makefile4
3 files changed, 4 insertions, 4 deletions
diff --git a/article/article.m4 b/article/article.m4
index bd1d3d3..b0c6174 100644
--- a/article/article.m4
+++ b/article/article.m4
@@ -10,7 +10,7 @@ include(left.htm)
<article id="contenu" role="article" class="post hentry clearfix">
-include(article/article.htm)
+include(tmpFileNameArticle)
</article>
</body></html>
diff --git a/article/intro.m4 b/article/intro.m4
index be1b945..da7e4ce 100644
--- a/article/intro.m4
+++ b/article/intro.m4
@@ -1,4 +1,4 @@
<article id="contenu" role="article" class="post hentry clearfix">
-undivert(article/intro.htm)
+undivert(tmpFileNameArticle)
<a href="linkFileNameArticle">Lire la suite</a>
</article>
diff --git a/makefile b/makefile
index b9e9794..49043e2 100644
--- a/makefile
+++ b/makefile
@@ -20,13 +20,13 @@ bin/introFilter: src/introFilter.hs src/Id.hs
article/%.html: article/%.md bin/articleFilter $(BASE_HTML)
pandoc --filter bin/articleFilter $< > ${@:.html=.htm}
- cat ${@:.html=.htm} | m4 > $@
+ m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} article/article.m4 > $@
NUMBERS = 1 2 3 4
article/%_intro.html: article/%.md bin/introFilter
pandoc --filter bin/introFilter $< > ${@:.html=.htm}
- cat ${@:.html=.htm} | m4 -D linkFileNameArticle=${<:.md=.html} > $@
+ m4 -D tmpFileNameArticle=${@:.html=.htm} -D linkFileNameArticle=${<:.md=.html} article/intro.m4 > $@
articles.htm: $(ALL_ARTICLES_INTRO_OUT) bin/introFilter
cat $(ALL_ARTICLES_INTRO_OUT) > $@