lilypond-1.0.4

diff --git a/aclocal.m4 b/aclocal.m4
index f7e18136b68f94f74298850d85bf220357fa2ada..660b3aca0afb084db32bbb80322a5431d81601fa 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -130,7 +130,7 @@ AC_DEFUN(AC_STEPMAKE_END, [
     AC_OUTPUT($CONFIGFILE.make:config.make.in)
 
     rm -f Makefile
-    cp make/Toplevel.make.in ./Makefile
+    cp make/toplevel.make.in ./Makefile
     chmod 444 Makefile
 ])
 
@@ -143,7 +143,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [
     then
            true
     else
-           AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs)
+           AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs)
     fi
 ])
 

diff --git a/configure b/configure
index 54964267a4f3c2682ebcc65812ccb7c9607d4948..e3925f717bff8ba73efa33905730f35710bc2048 100755 (executable)
--- a/configure
+++ b/configure
@@ -1427,7 +1427,7 @@ fi
            true
     else
            
-    echo "configure: warning: can't find g++ 2.7" 1>&2
+    echo "configure: warning: can\'t find g++ 2.7" 1>&2
     warn_b=yes
 
     fi
@@ -2626,7 +2626,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.h:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2824,7 +2824,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="$CONFIGFILE.hh:config.hh.in"
+  CONFIG_HEADERS="$CONFIGFILE.h:config.hh.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -3016,7 +3016,7 @@ fi
 
 
     rm -f Makefile
-    cp make/Toplevel.make.in ./Makefile
+    cp make/toplevel.make.in ./Makefile
     chmod 444 Makefile