termcol: rename scumm preset to dosbox

[sheet.git] / Makefile

diff --git a/Makefile b/Makefile
index 75f269b81c478281499b4abfc9d75470a402262d..77c9cb0e6d6fb833805d1740ed3dc4440205f5d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs
 data/unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl data/unicode-age.inc.pl unicode-table.inc.pl
        $(call cmdsave,$<)
 
-data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf
+data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf #TODO ttc
        $(call cmdsave,$^) || true
 
 data/unicode-sampler: $(download)
@@ -89,7 +89,7 @@ data/wordlist.%.inc.pl: tools/mkwordlist data/wordlist.version.txt
 data/word%.json: data/word%.inc.pl
        $(call cmdsave,perl -MJSON=encode_json -E "print encode_json(do \$$ARGV[0])" ./$<)
 data/%.json: %.inc.pl
-       $(call cmdsave,perl -MJSON=encode_json -E "print encode_json([ do \$$ARGV[0] ])" ./$<)
+       $(call cmdsave,perl -MJSON -E "print JSON->new->utf8->canonical->encode(do \$$ARGV[0])" ./$<)
 
 data/wordpairs.inc.pl: data/wordlist.version.txt
        @perl -I. -MShiar_Sheet::DB -MData::Dump=pp -E 'say pp(Shiar_Sheet::DB->connect->select("word w JOIN word a ON w.id=a.ref" => "w.id, a.id", {"a.lang"=>undef})->map or exit 1)' >$@