From 8b00c3d6e21063eb0fe50578f56a984f0211b50d Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Wed, 20 Jul 2005 17:48:26 +0000
Subject: [PATCH] ttf files for bitmap fonts should be generated with an
 extension of just "." to work around a quirk in fontforge (with thanks to
 George Williams for helping me fix this).

---
 Make.rules.in     |  2 +-
 fonts/.cvsignore  |  6 ++---
 fonts/Makefile.in | 67 +++++++++++++++++++++++++++--------------------
 fonts/genttf.ff   |  3 +--
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index fad7c3a7788..678afb38d4c 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -147,7 +147,7 @@ LINTS  = $(C_SRCS:.c=.ln)
 	$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
 
 .sfd.ttf:
-	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $<
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
 # 'all' target first in case the enclosing Makefile didn't define any target
 
diff --git a/fonts/.cvsignore b/fonts/.cvsignore
index 8b58a76f706..c46c3a3a963 100644
--- a/fonts/.cvsignore
+++ b/fonts/.cvsignore
@@ -5,7 +5,7 @@ wine_courer.fon
 wine_courier-1250-96-13.fnt
 wine_courier-1251-96-13.fnt
 wine_courier-1252-96-13.fnt
-wine_courier.ttf
+wine_courier.
 wine_marlett.ttf
 wine_sans_serif-1250-96-13.fnt
 wine_sans_serif-1250-96-16.fnt
@@ -15,14 +15,14 @@ wine_sans_serif-1251-96-20.fnt
 wine_sans_serif-1252-96-13.fnt
 wine_sans_serif-1252-96-16.fnt
 wine_sans_serif-1252-96-20.fnt
-wine_sans_serif.ttf
+wine_sans_serif.
 wine_sserife.fon
 wine_sserifee.fon
 wine_sserifer.fon
 wine_system-1250-96-16.fnt
 wine_system-1251-96-16.fnt
 wine_system-1252-96-16.fnt
-wine_system.ttf
+wine_system.
 wine_vgasys.fon
 wine_vgasyse.fon
 wine_vgasysr.fon
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index f90afcca46c..dd9a3856203 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -27,47 +27,56 @@ all: $(FONTS)
 
 @MAKE_RULES@
 
-wine_courier-1252-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1252 96 128 8
+wine_courier.: wine_courier.sfd
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_courier-1250-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1250 96 128 8
+wine_sans_serif.: wine_sans_serif.sfd
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_courier-1251-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1251 96 128 8
+wine_system.: wine_system.sfd
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_sans_serif-1252-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1252 96 129 5
+wine_courier-1252-96-13.fnt: wine_courier. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1252 96 128 8
 
-wine_sans_serif-1252-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1252 96 129 7
+wine_courier-1250-96-13.fnt: wine_courier. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1250 96 128 8
 
-wine_sans_serif-1252-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 20 1252 96 129 8
+wine_courier-1251-96-13.fnt: wine_courier. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1251 96 128 8
 
-wine_sans_serif-1250-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1250 96 129 5
+wine_sans_serif-1252-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1252 96 129 5
 
-wine_sans_serif-1250-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1250 96 129 7
+wine_sans_serif-1252-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1252 96 129 7
 
-wine_sans_serif-1251-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1251 96 129 5
+wine_sans_serif-1252-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 20 1252 96 129 8
 
-wine_sans_serif-1251-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1251 96 129 7
+wine_sans_serif-1250-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1250 96 129 5
 
-wine_sans_serif-1251-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 20 1251 96 129 8
+wine_sans_serif-1250-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1250 96 129 7
 
-wine_system-1252-96-16.fnt: wine_system.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1252 96 128 7
+wine_sans_serif-1251-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 13 1251 96 129 5
 
-wine_system-1250-96-16.fnt: wine_system.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1250 96 128 7
+wine_sans_serif-1251-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1251 96 129 7
 
-wine_system-1251-96-16.fnt: wine_system.ttf $(SFNT2FNT)
-	$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1251 96 128 7
+wine_sans_serif-1251-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 20 1251 96 129 8
+
+wine_system-1252-96-16.fnt: wine_system. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1252 96 128 7
+
+wine_system-1250-96-16.fnt: wine_system. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1250 96 128 7
+
+wine_system-1251-96-16.fnt: wine_system. $(SFNT2FNT)
+	$(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7
 
 wine_sserife.fon: wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $(FNT2FON)
 	$(FNT2FON) wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $@
@@ -105,6 +114,6 @@ uninstall::
 	-rmdir $(fontdir)
 
 clean::
-	$(RM) *.fon *.fnt *.ttf
+	$(RM) *.fon *.fnt *.ttf wine_courier. wine_sans_serif. wine_system.
 
 ### Dependencies:
diff --git a/fonts/genttf.ff b/fonts/genttf.ff
index b068e0e37d4..52de76ddafc 100644
--- a/fonts/genttf.ff
+++ b/fonts/genttf.ff
@@ -1,3 +1,2 @@
 Open($1)
-ttfname = $1:t:r + ".ttf"
-Generate(ttfname, "ttf", 0);
+Generate($2, "ttf", 0);