release: 1.0.4

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 5f282f05b1f5a90003d36e224be2d7254db5b599..660b3aca0afb084db32bbb80322a5431d81601fa 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/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
 ])
 
@@ -234,13 +234,16 @@ dnl    fi
        LN=cp # hard link does not work under cygnus-nt (yet?)
        ZIP="zip -r -9" #
        DOTEXE=.exe
+        INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c"
     else
        LN=ln
        ZIP="zip -r -9"
+        INSTALL="\$(stepdir)/../bin/install-sh -c"
     fi
     AC_SUBST(DOTEXE)
     AC_SUBST(ZIP)
     AC_SUBST(LN)
+    AC_SUBST(INSTALL)
 
     AC_STEPMAKE_DATADIR
 ])
@@ -351,14 +354,14 @@ AC_DEFUN(AC_STEPMAKE_MAN, [
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [
     # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
-    AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh)
+    AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh )
     AC_MSG_CHECKING(whether msgfmt accepts -o)
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
        AC_MSG_RESULT(yes)
     else
        # urg
-       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh"
        AC_MSG_RESULT(no)
        AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
     fi
@@ -424,6 +427,9 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_SUBST(YODL2TXT)
        export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
     fi
+    if test "x$YODL" = "-echo no yodl"; then
+       AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))
+    fi    
 ])
 
 dnl should cache result.