lilypond-1.1.23

diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh
index 4ae9087c393c9660b20b2c65d6358e6a7b0b4329..6e698cdc85bb1919225cc986f7fa51de6da01fa7 100644 (file)
--- a/buildscripts/set-lily.sh
+++ b/buildscripts/set-lily.sh
@@ -49,6 +49,7 @@ ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs
 ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm
 mkdir -p $prefix/share/lilypond
 ln -sf $LILYPOND_SOURCEDIR/ $prefix/share/lilypond
+rm $prefix/share/lilypond
 
 if [ -f ../.gdbinit ];
 then

diff --git a/configure b/configure
index f536f8621a678150681d827ad31268bc64bf44f0..7ea69f05531b5b68200a8bfd7514659301a8e9ca 100755 (executable)
--- a/configure
+++ b/configure
@@ -777,7 +777,7 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-    for ac_prog in make gmake
+    for ac_prog in gmake make
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -958,7 +958,7 @@ fi
     echo "configure: warning: Please install *GNU* make" 1>&2
     warn_b=yes
  
-       fi 
+       fi
     fi 
 
     

diff --git a/stepmake/configure b/stepmake/configure
index 40327a0452992b92e17e604895660b15180d443a..628df5924759625259f755d7f07da7cbd3801d1d 100755 (executable)
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -765,7 +765,7 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-    for ac_prog in make gmake
+    for ac_prog in gmake make
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -946,7 +946,7 @@ fi
     echo "configure: warning: Please install *GNU* make" 1>&2
     warn_b=yes
  
-       fi 
+       fi
     fi