From: janneke <janneke>
Date: Mon, 22 Nov 2004 22:30:06 +0000 (+0000)
Subject: * scm/define-markup-commands.scm (fill-line): Typo.
X-Git-Tag: release/2.5.23~912
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9d12ffc420afd8efe9d9becc44a461c025876e55;p=lilypond.git

* scm/define-markup-commands.scm (fill-line): Typo.

* buildscripts/guile-gnome.sh (GGVERSION): Build update for 2.7.96
and newer.
---

diff --git a/ChangeLog b/ChangeLog
index 59f5c3a4a9..2e431341a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/define-markup-commands.scm (fill-line): Typo.
+
+	* buildscripts/guile-gnome.sh (GGVERSION): Build update for 2.7.96
+	and newer.
+
 2004-11-22  Erik Sandberg  <ersa9195@student.uu.se>
 
         * ly/dynamic-scripts-init.ly: Fixed typo.
diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index d7143f5607..d23915959f 100644
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -176,12 +176,13 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
 	    sh autogen.sh --noconfigure
 	fi
 	cd ..
+	srcdir="../src"
     else
  	$WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
 	tar xzf $download/guile-gnome-platform-$GGVERSION.tar.gz
 	ln -s guile-gnome-platform-$GGVERSION guile-gnome
 	cd guile-gnome
-	ln -s . src
+	srcdir="../"
     fi
     
     rm -rf $OPT/guile-gnome
@@ -197,10 +198,10 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
 #
     if [ -z "$GCC34" ]; then
     # Use libtool-1.5.6, gcc-3.{2,3} without -O2,
-	CFLAGS='-O -g' ../src/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
+	CFLAGS='-O -g' $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
     else
     # or use gcc-3.4 with libtool-1.6.0
-	CC=$GCC34 ../src/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
+	CC=$GCC34 $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
     fi
     make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
 fi
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index ddd3b762ea..36886996d6 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -127,7 +127,7 @@ gsave /ecrm10 findfont
 			     point-stencil)
 			    stencils)))
 
-o    (if (null? (remove ly:stencil-empty? orig-stencils))
+    (if (null? (remove ly:stencil-empty? orig-stencils))
 	empty-stencil
 	(stack-stencils X RIGHT fill-space line-stencils))))