release: 1.3.153

[lilypond.git] / lily / kpath.cc

diff --git a/lily/kpath.cc b/lily/kpath.cc
index 8cbfc86a9fd3540ae2c61b2d6213eb3baa9a2a7a..56801ff29218a6182f6b391464579c50ae5cb746 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -69,7 +69,9 @@ ly_init_kpath (char *av0)
     
   */
 #ifndef __CYGWIN__  /* mktextfm/mktexpk does not work on windows */
+#ifndef DEBIAN
   unsetenv ("TFMFONTS");
+#endif
 #endif
 
   /*
@@ -78,14 +80,20 @@ ly_init_kpath (char *av0)
   kpse_set_program_name (av0, NULL);
   kpse_maketex_option ("tfm", TRUE);
 
+#ifdef DEBIAN
+  String my_tfm = "$VARTEXFONTS/tfm/public/lilypond";
+#else
   String my_tfm = "$VARTEXFONTS/tfm/lilypond/";
   my_tfm += version_str () + "/";
+#endif
 
-  char * mypath = kpse_expand (my_tfm.ch_C ());
+  char * mypath = kpse_expand ((my_tfm + ":").ch_C ());
+#ifndef DEBIAN
   String prog = "mktextfm --destdir ";
   prog += mypath;
   
   kpse_format_info[kpse_tfm_format].program = strdup (prog.ch_C ());
+#endif
   kpse_format_info[kpse_tfm_format].client_path = mypath;
 #endif
 }