From e385f4fe42607b3558b27be40cb0f2b666e08b06 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 9 Apr 2005 13:21:37 +0000 Subject: [PATCH] (init_fontconfig): be verbose about font path. (init_fontconfig): success is 0, not !0 --- ChangeLog | 1 + GNUmakefile.in | 7 ------- lily/font-config.cc | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0541412bf..bb7f327a23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2005-04-09 Han-Wen Nienhuys * lily/font-config.cc (init_fontconfig): be verbose about font path. + (init_fontconfig): success is 0, not !0 2005-04-08 Han-Wen Nienhuys diff --git a/GNUmakefile.in b/GNUmakefile.in index cd0dd2c4a6..862b9e52e8 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -59,13 +59,6 @@ web-uninstall: local-install: $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir) -final-install: - @echo '*** Before using LilyPond, the contents of one of the login scripts' - @echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.' - @echo '*** LilyPond should have been installed to do that automatically' - @echo '*** when you log in. So, please log out now and log in again.' - @echo '*** For more information see Invoking LilyPond in the manual.' - web-ext = html midi pdf png txt ly footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) diff --git a/lily/font-config.cc b/lily/font-config.cc index 3c564a2c9a..eda9405fb7 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -32,7 +32,7 @@ init_fontconfig () struct stat statbuf; String builddir = prefix_directory + "/mf/out/"; - if (stat (builddir.to_str0 (), &statbuf) != 0) + if (stat (builddir.to_str0 (), &statbuf) == 0) { dirs.push (builddir.to_str0 ()); } @@ -51,8 +51,8 @@ init_fontconfig () String dir = dirs[i]; if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ())) error (_f ("Failed to add lilypond directory %s", dir.to_str0 ())); - else if (be_verbose_global_b) - progress_indication (_ ("Adding font directory %s", dir.to_str0 ())); + else if (be_verbose_global) + progress_indication (_f ("Adding font directory %s\n", dir.to_str0 ())); } if (be_verbose_global) -- 2.39.5