Fix font dir description.

diff --git a/ChangeLog b/ChangeLog
index 11f6485e2dc7f15760bb17cc62d0f591011b73b6..6de9443a830a53e22a86e8e958a484725de50e86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-gnome.scm: Fix font dir description.
+
 2004-09-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * input/test/mensural-ligatures.ly (voice): move linethickness

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 564d2380e5d8afb8cc2e8138f0f878ce85bcbe9b..32a139e83d0b0a2009cf38f5fde40bb4abdc933d 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -13,11 +13,15 @@ set -ex
 
 # Where user built stuff will be installed
 OPT=$HOME/usr/pkg
+## when using GUILE CVS, make a slib/require like so:
+## cd ~/usr/pkg/guile/share/guile/1.7 && ln -s /usr/share/guile/1.6/slib .
+## cd && guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+## otherwise, this may fix it...
 SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.5.992
+GGVERSION=2.5.993
 
 export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
@@ -73,7 +77,7 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
 fi
 
 ## 3. Currently (2004-9-15) GUILE CVS works again
-## PATH=/usr/bin:$PATH
+##PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 904daeb8147bbcfd3647b7f283c40391635b4eac..074a82538d3336a3e91dbf59fdb55387d4c55c7b 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -38,13 +38,15 @@
 ;;;  
 ;;;   * Build LilyPond with gui support: configure --enable-gui
 ;;;
-;;;   * Supposing that LilyPond was built in ~/cvs/lilypond, tell X about
-;;;     feta fonts:
+;;;   * Supposing that LilyPond was built in ~/cvs/savannah/lilypond,
+;;;     tell fontconfig about the feta fonts dir:
 "
-ln -s ~/cvs/lilypond/mf/out ~/.fonts
-mkfontdir ~/.fonts
-xset +fp ~/.fonts
+<fontconfig>
+<dir>~/cvs/savannah/lilypond/mf/out</dir>
+</fontconfig>
 "
+;;;     or copy all your .pfa/.pfb's to ~/.fonts if your fontconfig
+;;;     already looks there for fonts
 ;;;
 ;;;   * Setup environment
 "