(install-fc-cache): remove old font.cache-1 files.

diff --git a/ChangeLog b/ChangeLog
index d76e509809f66f3f75580211defd417239ccc1e7..178fa4af0a580394bd491d7a643057eb31eb15cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * mf/GNUmakefile (install-fc-cache): remove old font.cache-1 files.
+
 2005-12-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/font-config.cc (init_fontconfig): verbosity.

diff --git a/lily/font-config.cc b/lily/font-config.cc
index ee7f8de8a438749aa8b38197d588f04a810b3bfd..56103274d6fbf435927e3856ec0d372d2382973e 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -36,7 +36,6 @@ init_fontconfig ()
   if (!is_file ((char*)cache_file))
     message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
                        
-  FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
   
   Array<String> dirs;
@@ -53,8 +52,6 @@ init_fontconfig ()
        message (_f ("adding font directory: %s", dir.to_str0 ()));
     }
 
-  font_config_global = FcConfigGetCurrent ();
-  
   if (be_verbose_global)
     progress_indication ("\n");
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 92b1f3c1f284e50def253a02ffe2395177bfc781..6c613432fa15b0a2270669d525969dd74aef8de4 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -131,6 +131,7 @@ $(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES)
 local-install: install-fc-cache
 
 install-fc-cache:
+       $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), rm -f $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/fonts.cache-1 && ) true
        fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)