From f68704c31424f23cb2fdf767518b93eb3b18f552 Mon Sep 17 00:00:00 2001 From: ache Date: Fri, 21 Feb 2020 03:33:53 +0100 Subject: Improve makefile usability --- makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 1a30a16..451e98f 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ -MD_CMD=remark --rc-path remarkrc +MD_CMD=npx remark --rc-path remarkrc CATCH_CMD=pup HTML_MINIFIER_CMD=htmlmin BASE_HTML=tmp/left.htm tmp/headers.htm @@ -36,9 +36,9 @@ articles/%.html: articles/%.md $(BASE_HTML) articles/tmp/%_intro.html: articles/%.html @echo "> Création des introductions d'articles" mkdir -p articles/tmp - cat $< | $(CATCH_CMD) "h1" > $(@:.html=.htm) - cat $< | $(CATCH_CMD) "h1 + p" | sed 's/res\//articles\/res\//' >> $(@:.html=.htm) - cat $< | $(CATCH_CMD) "h1 + p + p" >> $(@:.html=.htm) + @cat $< | $(CATCH_CMD) "h1" > $(@:.html=.htm) + @cat $< | $(CATCH_CMD) "h1 + p" | sed 's/res\//articles\/res\//' >> $(@:.html=.htm) + @cat $< | $(CATCH_CMD) "h1 + p + p" >> $(@:.html=.htm) m4 -D tmpFileNameArticle=$(@:.html=.htm) -D linkFileNameArticle=$(<:.html=) articles/intro.m4 > $@ -- cgit v1.2.3