* mf/aybabtu.pe.in (i): don't generate aybabtu.cff

* mf/GNUmakefile ($(outdir)/fonts.cache-1): create font cache for
outdir.
(install-fc-cache): insatll font cache in installation directories.

diff --git a/ChangeLog b/ChangeLog
index 7866304e39adef74add8c02251b45b3689e27e94..928dfa669e68f5066a21bf578afeb52060d9e384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * mf/aybabtu.pe.in (i): don't generate aybabtu.cff
+
        * mf/GNUmakefile ($(outdir)/fonts.cache-1): create font cache for
        outdir.
        (install-fc-cache): insatll font cache in installation directories.

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index cee0de6fa6197db9f42b250c3770f8c4da78b521..b31fb4f747804f2e00b225b907906fe23e81389c 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -138,7 +138,7 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES)
 
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/font.cache-1
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source

diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index 63ecfdfaae074a637d70c3229862bbb4824e7474..98b691e804ae58f868267823bd717737b44e8d8d 100644 (file)
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -83,7 +83,6 @@ LoadTableFromFile("LILY", "aybabtu.otf-gtable")
 MergeFonts ("feta-alphabet20.pfa");
 
 Generate("aybabtu.otf");
-Generate("aybabtu.cff");
 Generate("aybabtu.svg");
 SetFontNames("PFAAybabtu-Regular", "PFAAybabtu", "PFAAybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
 Generate("PFAaybabtu.pfa");