(init_fontconfig): be verbose about font path.

(init_fontconfig): success is 0, not !0

diff --git a/ChangeLog b/ChangeLog
index a0541412bfe2a7c66f377c0c909ce460d954fb6e..bb7f327a237cde05fcedf1d9f670195c1c13a740 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2005-04-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/font-config.cc (init_fontconfig): be verbose about font path.
+       (init_fontconfig): success is 0, not !0
 
 2005-04-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index cd0dd2c4a66b84beef8749fad1ffd6f1feddcf5a..862b9e52e84c5d0891c6c15ae6dadc776e775e82 100644 (file)
--- 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 3c564a2c9ad4580cb6b37209fa2921fd2360eb03..eda9405fb7ab0661a50459253c591923126d6be9 100644 (file)
--- 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)