lilypond-1.3.61

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 966546c2d986b151848b722886f0595cd7a9ff2e..eba97b0ec6b0d2819805cb80f90fa21228f6fd39 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -119,8 +119,8 @@ All_font_metrics::find_font (String name)
   if (f)
     return f;
 
-  error (_f ("can't find default font: `%s'", def_name.ch_C ()));
-  error (_f ("(search path: `%s')", search_path_.str ()));
+  non_fatal_error (_f ("can't find default font: `%s'", def_name.ch_C ()));
+  non_fatal_error (_f ("(search path: `%s')", search_path_.str ()));
   error (_ ("Giving up"));
 
   return 0;

diff --git a/make/mudela-rules.make b/make/mudela-rules.make
index fa170d169806b6292e9930ef69e7897dd82a38fa..9143c6bf45377bf247c8c2478125509077c67c9d 100644 (file)
--- a/make/mudela-rules.make
+++ b/make/mudela-rules.make
@@ -5,9 +5,9 @@
 SUBST_TEXI_DEPS=sed 's! \.\./! !g' < $(basename $@).dep > $(outdir)/temp.dep ;         mv $(outdir)/temp.dep $(basename $@).dep 
 
 $(outdir)/%.latex: %.doc
-       cd $(outdir);  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ ../$< 
+       cd $(outdir);LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ ../$< 
        $(SUBST_TEXI_DEPS)
 
 $(outdir)/%.texi: %.tely
-       cd $(outdir); $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
+       cd $(outdir); LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
        $(SUBST_TEXI_DEPS)