From 8e8fe407f670ec94c16d96b413d00dfe2c900fde Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:23:15 +0000 Subject: [PATCH] lilypond-1.3.61 --- lily/all-font-metrics.cc | 4 ++-- make/mudela-rules.make | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 966546c2d9..eba97b0ec6 100644 --- 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 fa170d1698..9143c6bf45 100644 --- 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) -- 2.39.5