# HG changeset patch # User Matti Hamalainen # Date 1571894388 -10800 # Node ID 32893335efc0f3593cfe03f590fb74e7a7674349 # Parent 71d94f9657255beb8aba63f050762ddff6d6da3b# Parent fe025c461760fd736f934fb53e2f1a676b3c258f Merge. diff -r fe025c461760 -r 32893335efc0 Makefile.gen --- a/Makefile.gen Tue Oct 08 14:49:00 2019 +0300 +++ b/Makefile.gen Thu Oct 24 08:19:48 2019 +0300 @@ -269,9 +269,9 @@ DATA2INC_BIN=data2inc DATA2INC_DEP= else -FONTCONV_BIN=$(DMLIB)tools/fontconv +FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) FONTCONV_DEP=$(FONTCONV_BIN) -DATA2INC_BIN=$(DMLIB)tools/data2inc +DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT) DATA2INC_DEP=$(DATA2INC_BIN) endif