Fix merge conflict on the notebook

[fiction/jasmina.git] / Makefile

diff --git a/Makefile b/Makefile
index a31a677956798a862e13adb95e9bdd50f8413b21..794217c2d5994d209138dbf488609bcb199964ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 all: jasmina.html jasmina.epub
 
 all.mdwn: order.lst $(wildcard *.txt)
-       for i in `cat order.lst`; do cat "$$i"; echo ""; done > $@
+       for i in `cat order.lst`; do sed 's/<TBD>/*(Фрагмент недописан)*/' "$$i"; echo ""; done > $@
 jasmina.html: all.mdwn
-       pandoc -t html all.mdwn -o jasmina.html
+       pandoc -t html --toc -s all.mdwn -o jasmina.html
 jasmina.epub: all.mdwn
        pandoc -t epub  all.mdwn -o jasmina.epub