vi: g^g is an incompatible feature introduced by vim

[sheet.git] / Makefile

diff --git a/Makefile b/Makefile
index 0780346721bcb69f52964be1b9e057ff25a39200..c13afc16e0f8feb0ed7c7788f5f47241bfb60107 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ttfsupport/%.inc.pl: tools/mkttfinfo data/font/%.ttf
 .SECONDARY:
 data/font/%.ttf:
        find /usr/share/fonts/truetype/ ~/.fonts/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
-data/font/%.win95.ttf:
+data/font/%.win2k.ttf:
        find /usr/share/fonts/truetype/msttcorefonts/ -iname "$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
 data/font/dv%.ttf:
        find /usr/share/fonts/truetype/dejavu/ -iname "DejaVu*$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
@@ -48,6 +48,8 @@ data/font/droid%.ttf:
        find /usr/share/fonts/truetype/droid/ -iname "Droid*$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
 data/font/droidserif.ttf:
        ln -sf /usr/share/fonts/truetype/droid/DroidSerif-Regular.ttf $@
+data/font/free%.ttf:
+       find /usr/share/fonts/truetype/freefont/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
 data/font/roboto.ttf:
        ln -sf /usr/share/fonts/truetype/roboto/Roboto-Regular.ttf $@
 data/font/noto%.ttf:
@@ -58,11 +60,11 @@ ttfsupport: tools/mkttfinfo
        $(MAKE) ttfsupport/all
        touch $@
 
-ttfsupport/all: ttfsupport/all-win95 ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
-ttfsupport/all-win95: ttfsupport/verdana.win95.inc.pl ttfsupport/times.win95.inc.pl ttfsupport/arial.win95.inc.pl ttfsupport/cour.win95.inc.pl ttfsupport/comic.win95.inc.pl ttfsupport/georgia.win95.inc.pl ttfsupport/arialuni.inc.pl
+ttfsupport/all: ttfsupport/all-win2k ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
+ttfsupport/all-win2k: ttfsupport/verdana.win2k.inc.pl ttfsupport/times.win2k.inc.pl ttfsupport/arial.win2k.inc.pl ttfsupport/cour.win2k.inc.pl ttfsupport/comic.win2k.inc.pl ttfsupport/georgia.win2k.inc.pl ttfsupport/arialuni.inc.pl
 ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
 ttfsupport/all-google: ttfsupport/droidsans.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/notosans.inc.pl ttfsupport/notoserif.inc.pl
-ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl
+ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl ttfsupport/freesans.inc.pl ttfsupport/freeserif.inc.pl
 
 #ttfsupport/unifont.inc.pl: tools/mkttfinfo
 #      $< unifont.ttf $@