lilypond-1.0.2

diff --git a/Documentation/README-W32.yo b/Documentation/README-W32.yo
index 1523309d65fdfbadbcbdefd5eea0488e37eb6b3c..506be7899af580a34730d900d6f925d303a3a609 100644 (file)
--- a/Documentation/README-W32.yo
+++ b/Documentation/README-W32.yo
@@ -380,7 +380,7 @@ spaces.  And then place it in the bash shell path by editing
 $CYGFS/cygnus.bat.
 
 subsubsect(Yodl Document Language) 
-lurl(http://www.digicash.com/~jan/yodl/)
+lurl(http://www.xs4all.nl/~jantien/yodl/)
 
 Yodl for documentation in Lilypond.  It is currently being updated by
 Jan Nieuwenhuizen.  The development methodology of em(Yodl) as well as
@@ -413,7 +413,7 @@ em(lilypond).
                                    
 itemize(
 it() download the package from
-lurl(http://www.digicash.com/~jan/yodl/) to
+lurl(http://www.xs4all.nl/~jantien/yodl/) to
 file($HOME/usr/src/releases).
 it() From a bash shell, cd file($HOME/usr/src).
 it() tar zxf releases/yodl-em(<version>).tar.gz 

diff --git a/Documentation/links.yo b/Documentation/links.yo
index acabea0e7b887f8e4921a845faef9b37f788ea88..d0b9a87ca7c3fbb18b181883e87f2e133d954aa3 100644 (file)
--- a/Documentation/links.yo
+++ b/Documentation/links.yo
@@ -12,7 +12,7 @@ nsubsect(LilyPond)
 
 description(
 dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site.
-dit(lurl(http://www.digicash.com/~jan/lilypond/))Jan's site.
+dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site.
 dit(lurl(http://sca.uwaterloo.ca/lilypond/))The canadian mirror
 (thanks, Eric!)
 )
@@ -26,7 +26,7 @@ dit(lurl(http://www.gnu.org/))
 dit(lurl(http://www.zib.de/Visual/software/doc++/index.html))
     The documentation system for C++ sources, which is used for the
     LilyPond sources.
-dit(lurl(http://www.digicash.com/~jan/yodl/index.html))
+dit(lurl(http://www.xs4all.nl/~jantien/yodl/index.html))
     LilyPond documentation is in Yodl.  You'll need a recent
     development version from 
     lurl(ftp://pcnov095.win.tue.nl/pub/yodl/development).

diff --git a/Documentation/man/Makefile b/Documentation/man/Makefile
index a3157a3eb9c6334d689a50e4a615af1bb2b1ec17..1460196b887dc31e154dfc59dd32b49272149110 100644 (file)
--- a/Documentation/man/Makefile
+++ b/Documentation/man/Makefile
@@ -13,7 +13,9 @@ MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES
 
 OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
 
-default: $(MANTXT) $(MANGROFF)
+OUT_DIST_FILES += $(MANGROFF)
+
+default: $(MANGROFF)
 
 texinfo: $(OUTTEXINFO_FILES)
 

diff --git a/Documentation/man/lilypond.yo b/Documentation/man/lilypond.yo
index c027f6c6f549f420e59df237d0b96000345bc01b..b0bb0316ae13ea529043dc7938841a39e306fd4f 100644 (file)
--- a/Documentation/man/lilypond.yo
+++ b/Documentation/man/lilypond.yo
@@ -247,5 +247,5 @@ itemize(
 it()nemail(Han-wen Nienhuys)(hanwen@cs.uu.nl)
     lurl(http://www.cs.uu.nl/people/hanwen)
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org)
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
 )

diff --git a/Documentation/man/mi2mu.yo b/Documentation/man/mi2mu.yo
index 85decf245a3ced0ca83e9050e768e5dde50936c5..14d3d7d3b4af840eac03a81364f28f15c94905e6 100644 (file)
--- a/Documentation/man/mi2mu.yo
+++ b/Documentation/man/mi2mu.yo
@@ -86,5 +86,5 @@ manpageauthor()
 Please consult the documentation file file(AUTHORS) for more detailed
 information, and small contributions. 
 
-nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.digicash.com/~jan)
+nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.xs4all.nl/~jantien)
 

diff --git a/Documentation/topdocs/AUTHORS.yo b/Documentation/topdocs/AUTHORS.yo
index b1c6ec64bd74a64061618461cde836cc9fc73c66..4db956cde2b50628720f112938040f45d285dd10 100644 (file)
--- a/Documentation/topdocs/AUTHORS.yo
+++ b/Documentation/topdocs/AUTHORS.yo
@@ -27,7 +27,7 @@ it()nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl),
     nl()
     Main author.
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org), 
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
     nl()
     Main author
 it()nemail(Alexandre Oliva)(oliva@dcc.unicamp.br), 

diff --git a/aclocal.m4 b/aclocal.m4
index 0f54b68df8b877e0ac02d4f08e78a27ecd618f05..dbcb4d30d29a0c68a1ed781f3a84257816c0cec3 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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
 ])
@@ -350,17 +353,21 @@ AC_DEFUN(AC_STEPMAKE_MAN, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [
-    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    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="touch $@; echo "
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
        AC_MSG_RESULT(no)
        AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
     fi
+    if test ! -n "$MSGFMT"; then
+       AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
@@ -420,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.

diff --git a/config.make.in b/config.make.in
index 9aecaf66f248a2f78a10fc6ffd1f1f8ee58abca2..25bfe5945aaafa765240ea9e9e47bf9279339006 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -38,6 +38,7 @@ DEFS = @DEFS@
 DEFINES = @DEFS@ @DEFINES@
 COMPILEINFO = @COMPILEINFO@
 DOTEXE = @DOTEXE@
+INSTALL = @INSTALL@
 BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@

diff --git a/configure b/configure
index 2dd916582db48ceb18bb43beeeb592bded22456c..493ae9c0e39fcd8a72f86894f8d48e289cd3b69a 100755 (executable)
--- a/configure
+++ b/configure
@@ -878,13 +878,16 @@ 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
     
     
     
+    
 
     
     if test "$datadir" = "\${prefix}/share"; then
@@ -1002,7 +1005,7 @@ EOF
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1006: checking for $ac_word" >&5
+echo "configure:1009: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1031,7 +1034,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1035: checking for $ac_word" >&5
+echo "configure:1038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1079,7 +1082,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1083: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1086: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1089,11 +1092,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1093 "configure"
+#line 1096 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1113,12 +1116,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1117: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1120: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1122: checking whether we are using GNU C" >&5
+echo "configure:1125: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1127,7 +1130,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1142,7 +1145,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1146: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1149: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1199,7 +1202,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1203: checking how to run the C++ preprocessor" >&5
+echo "configure:1206: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1212,12 +1215,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1216 "configure"
+#line 1219 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1248,7 +1251,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1252: checking for $ac_word" >&5
+echo "configure:1255: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1279,7 +1282,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1283: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1286: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1289,11 +1292,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1293 "configure"
+#line 1296 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1313,12 +1316,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1317: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1320: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1322: checking whether we are using GNU C++" >&5
+echo "configure:1325: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1327,7 +1330,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1342,7 +1345,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1346: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1349: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1372,17 +1375,17 @@ fi
 
     ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:1376: checking for FlexLexer.h" >&5
+echo "configure:1379: checking for FlexLexer.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1381 "configure"
+#line 1384 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1431,12 +1434,12 @@ fi
 
 
     echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6
-echo "configure:1435: checking whether explicit instantiation is needed" >&5
+echo "configure:1438: checking whether explicit instantiation is needed" >&5
 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1440 "configure"
+#line 1443 "configure"
 #include "confdefs.h"
 
     template <class T> struct foo { static int baz; };
@@ -1446,7 +1449,7 @@ int main() {
  return foo<int>::baz; 
 ; return 0; }
 EOF
-if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   lily_cv_need_explicit_instantiation=no
 else
@@ -1473,7 +1476,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1477: checking for $ac_word" >&5
+echo "configure:1480: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1515,7 +1518,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1519: checking for $ac_word" >&5
+echo "configure:1522: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1549,7 +1552,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1553: checking for $ac_word" >&5
+echo "configure:1556: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1616,7 +1619,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1620: checking for $ac_word" >&5
+echo "configure:1623: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1648,7 +1651,7 @@ test -n "$AR" || AR="error"
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1652: checking for $ac_word" >&5
+echo "configure:1655: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1703,7 +1706,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1707: checking language" >&5    
+echo "configure:1710: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;
@@ -1739,7 +1742,7 @@ EOF
 
 
     echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:1743: checking for gettext in -lintl" >&5
+echo "configure:1746: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1747,7 +1750,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1751 "configure"
+#line 1754 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -1761,7 +1764,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1791,12 +1794,12 @@ fi
     for ac_func in gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1795: checking for $ac_func" >&5
+echo "configure:1798: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1800 "configure"
+#line 1803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1822,7 +1825,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1848,12 +1851,13 @@ done
 
 
 
+    # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
     for ac_prog in msgfmt
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1857: checking for $ac_word" >&5
+echo "configure:1861: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1880,21 +1884,27 @@ fi
 
 test -n "$MSGFMT" && break
 done
-test -n "$MSGFMT" || MSGFMT="-echo no msgfmt"
+test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh"
 
     echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6
-echo "configure:1887: checking whether msgfmt accepts -o" >&5
+echo "configure:1891: checking whether msgfmt accepts -o" >&5
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
        echo "$ac_t""yes" 1>&6
     else
        # urg
-       MSGFMT="touch ; echo "
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
        echo "$ac_t""no" 1>&6
        
     echo "configure: warning: please install msgfmt from GNU gettext" 1>&2
     warn_b=yes
 
+    fi
+    if test ! -n "$MSGFMT"; then
+       
+    echo "configure: warning: please install msgfmt from GNU gettext" 1>&2
+    warn_b=yes
+
     fi
 
 
@@ -1930,7 +1940,7 @@ fi
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6
-echo "configure:1934: checking TeX/MF root dir directory" >&5    
+echo "configure:1944: checking TeX/MF root dir directory" >&5    
 
     find_root_prefix="$prefix"
     
@@ -1971,7 +1981,7 @@ echo "configure:1934: checking TeX/MF root dir directory" >&5
     
     
     echo $ac_n "checking MF input directory""... $ac_c" 1>&6
-echo "configure:1975: checking MF input directory" >&5    
+echo "configure:1985: checking MF input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')`
     
@@ -1996,7 +2006,7 @@ echo "configure:1975: checking MF input directory" >&5
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6
-echo "configure:2000: checking TeX input directory" >&5    
+echo "configure:2010: checking TeX input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     
@@ -2027,7 +2037,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2031: checking for $ac_word" >&5
+echo "configure:2041: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2061,7 +2071,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2065: checking for $ac_word" >&5
+echo "configure:2075: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2095,7 +2105,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2099: checking for $ac_word" >&5
+echo "configure:2109: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2128,7 +2138,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2132: checking for $ac_word" >&5
+echo "configure:2142: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2162,7 +2172,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2166: checking for $ac_word" >&5
+echo "configure:2176: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2196,7 +2206,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2200: checking for $ac_word" >&5
+echo "configure:2210: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2234,6 +2244,12 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
        
        export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
     fi
+    if test "x$YODL" = "-echo no yodl"; then
+       
+    echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2
+    warn_b=yes
+
+    fi    
 
 
 
@@ -2248,7 +2264,7 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2252: checking for 8-bit clean memcmp" >&5
+echo "configure:2268: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2256,7 +2272,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2260 "configure"
+#line 2276 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2269,7 +2285,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2287,12 +2303,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2291: checking for vprintf" >&5
+echo "configure:2307: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2296 "configure"
+#line 2312 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2318,7 +2334,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2342,12 +2358,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2346: checking for _doprnt" >&5
+echo "configure:2362: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2351 "configure"
+#line 2367 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2373,7 +2389,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2400,12 +2416,12 @@ fi
 for ac_func in memmem snprintf vsnprintf gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2404: checking for $ac_func" >&5
+echo "configure:2420: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2409 "configure"
+#line 2425 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2431,7 +2447,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2470,7 +2486,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2474: checking for $ac_word" >&5
+echo "configure:2490: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2661,6 +2677,7 @@ s%@PYTHON@%$PYTHON%g
 s%@DOTEXE@%$DOTEXE%g
 s%@ZIP@%$ZIP%g
 s%@LN@%$LN%g
+s%@INSTALL@%$INSTALL%g
 s%@DIR_DATADIR@%$DIR_DATADIR%g
 s%@subdirs@%$subdirs%g
 s%@CC@%$CC%g

diff --git a/init/score-paper.ly b/init/score-paper.ly
index f0e4783822fc62a83673efee328f3c1de844cf5c..f4e170a732e720a4351d4e59cd779dc90010b90f 100644 (file)
--- a/init/score-paper.ly
+++ b/init/score-paper.ly
@@ -2,7 +2,7 @@
 
 \paper { 
        % for simple testing only!
-       castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn
+%      castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn
 Staff = \translator {
        \type "Hara_kiri_line_group_engraver";
 

diff --git a/input/Makefile b/input/Makefile
index b557d18d4bec4b1279957d963056d4371fa623f2..1919c9e34399e80c430a7fadf244ec09cbd4fdd7 100644 (file)
--- a/input/Makefile
+++ b/input/Makefile
@@ -12,3 +12,6 @@ flexamples=example-1 example-2
 
 include $(stepdir)/WWW.make
 
+
+local-check: $(addsuffix .dvi, $(addprefix $(outdir)/, $(examples)))
+

diff --git a/lily/text-def.cc b/lily/text-def.cc
index faf0dae1c4cfc65862599f7ea89dbea837cd8fec..b0dbaf5611c667eea0e2d1163dfa3908603f71a2 100644 (file)
--- a/lily/text-def.cc
+++ b/lily/text-def.cc
@@ -26,6 +26,9 @@ Text_def::width (Paper_def * p) const
 {
   Atom a = get_atom (p,CENTER);
 
+  /* TODO: check string for \texcommand
+   */
+
   Real guess_width_f = text_str_.length_i() * a.dim_.x ().length (); // ugh
   Interval i (0, guess_width_f);
   i += - (align_dir_ + 1)* i.center();

diff --git a/mf/Makefile b/mf/Makefile
index 42c18fec889c38920159a497a17b2c0c14a14ca1..407ce8ea2769632ae27d07157be24b93255993c9 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -14,7 +14,11 @@ LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
+
 ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
+
+OUT_DIST_FILES += $(AFM_FILES)
+
 default: $(ALL_GEN_FILES)
 
 

diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/Makefile
index dc9e90a4722006f6e740eb95c6143cb41f880550..4363beefe852703da348cc453e364b3d39481b39 100644 (file)
--- a/mutopia/Coriolan/Makefile
+++ b/mutopia/Coriolan/Makefile
@@ -6,8 +6,8 @@ include $(depth)/make/Stepmake.make
 include $(make-dir)/Mutopia.make
 
 # do Coriolan if you have plenty RAM / CPU
-# examples=coriolan oboi-part viola-part
-examples= oboi-part viola-part
+examples=coriolan oboi-part viola-part
+# examples= oboi-part viola-part
 
 include $(stepdir)/WWW.make
 

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index 64f5e71d681d18b57068bf4817f0aa4582684a7f..185e298a397b9f598a93b4a1dd80f2f346d42299 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -1,10 +1,10 @@
 \header{
 filename =      "standchen.ly";
-title    = "St\"andchen";
-subtitle = "(Serenade)\\\``Leise flehen meine Lieder";
+title    = "St\\\"andchen";
+subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
 opus =  "D. 957 No. 4";
-composer =      "Franz Schubert (1797-1828)"
-        "Text by Ludwig Rellstab (1799-1860)";
+composer =      "Franz Schubert (1797-1828)";
+poet=   "Text by Ludwig Rellstab (1799-1860)";
 enteredby =     "JCN";
 copyright =     "public domain";
 } 
@@ -20,9 +20,9 @@ $vocal_verse1 = \melodic\relative c{
        % ugh: treble/bass
 %      \clef treble;
 %      \clef violin;
-       [/3 g''8( )as] g \] c4. g8 |
-       [/3 f8( )g] f \] c'4 f,8 r |
-       g4.-> f8 [/3 f( )es] d \] |
+       [/3 g''8( )as] g \]/1 c4. g8 |
+       [/3 f8( )g] f \]/1 c'4 f,8 r |
+       g4.-> f8 [/3 f( )es] d \]/1 |
        es2 r4 |
        % ugh: a whole should be a measure
        %r1 |
@@ -84,7 +84,7 @@ $lyric_verse1 = \lyric{
        _ _ _ |
 % 11
        \[/3 In4 den8 \] stil-4. len8 |
-       \[/3 Hainr4 her-8 \] nie-4. der8 |
+       \[/3 Hain4 her-8 \] nie-4. der8 |
        Lieb4. chen8 \[/3 komm4 zu8 \] |
        mir!2 _4 |
        _4 _ _ |
@@ -94,8 +94,8 @@ $lyric_verse1 = \lyric{
        Wip-8. fel16 rau-4. schen8 |
        \[/3 In4 des8 \] Mon-4. des8 |
        Licht;2. |
-       _4 _ _ |
-       _4 _ _ |
+       \[/3 In4 des8 \] Mon-4. des8 |
+       Licht;2. |
 % 23 
        Des8. Ver-16 r\"a-4. ters8 |
        feind-8. lich16 Lau-4. schen8 |
@@ -143,10 +143,12 @@ $lyric_through = \lyric{
 % 37
        La\ss8. auch16 dir8. die16 Brust8. be-16 |
        we-4 gen _ |
-       Lieb-4. chen8 h\"o-8. re16 |
+       Lieb-4. chen,8 h\"o-8. re16 |
        mich!2 _4 |
-       Be-8. bend16 harr4 ich8 _8 |
+       Be-4. bend8 \[/3 harr'4 ich8\]/1 |
        dir8. ent-16 ge-4 gen!8 _8 |
+       _2. |
+       _2. |
        \[/3 Komm4 be-8 \] gl\"u4. cke8 |
        mich!2. |
        \[/3 Komm4 be-8 \] gl\"u4. cke8 |
@@ -198,7 +200,7 @@ $treble_verse1 = \melodic\relative c{
        r8 <[e g> <g c> <e g> <g c> <e g]> |
        r8 <[f a c> <a c f> <f a c> <a c f> <f a c]> |
        r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \] a4. f8 } > |
+       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
        <e2 e'> r4 |
 }
 
@@ -243,7 +245,7 @@ $treble_through = \melodic\relative c{
        r8 <[f,\p a c> <a c f> <f a c> <a c f> <f a c]> |
        %70
        r8 <[e g c> <g c e> <e g c> <g c e> <e g c]> |
-       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \] a4. f8 } > |
+       <{[/3 f8\f( e f]1/1 a4. )f8 } {\[/3 f' e f \]/1 a4. f8 } > |
        <e'2 e'> r4 |
        <es2 es'> r4 |
        <d2 d'> r4 |
@@ -328,8 +330,8 @@ $bass_through = \melodic\relative c{
        <g8 g'> <[d'' g> <g b> <d g> <g b> <d g]> |
        c,8 <[c' e g> <e g c> <c e g> <e g c> <c e g]> |
 
-       <c,8 c'> <[c' es! g> <es g c> <c es! g> <es g c> <c es! g]> |
-       <f,,8 f'> <[d'' f> <f as!> <d f> <f as!> <d f]> |
+       <c,8 c'> <[c' es! g> <es g c> <c es g> <es g c> <c es g]> |
+       <f,,8 f'> <[d'' f> <f as!> <d f> <f as> <d f]> |
        %75
        <g,,8 g'> <[d'' f> <f g> <d f> <f g> <d f]> |
        c,8 <[c' e> <e g> <c e> <e g> <c e]> |
@@ -422,10 +424,13 @@ $grand_staff = \type GrandStaff<
 >
 
 \score{
+       % Transpose as you like for your voice
+       % Range untransposed is c' to f'' (for tenors and sopranos)
+       % \transpose a gives a' to d''
        <
-               \$vocal_staff
+               { \melodic \transpose a { \$vocal_staff } }
                \$lyric_staff
-               \$grand_staff
+               { \melodic \transpose a { \$grand_staff } }
        >
        \include "score-paper.ly";
        \midi{

diff --git a/po/Makefile b/po/Makefile
index d951b5a320af7b46af7513a16ba6ddde4639bfa4..e0c550371e308a8587e98ef440b0a6e37f1db917 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -27,6 +27,6 @@ localinstall: $(MO_FILES)
 localuninstall:
        for i in $(CATALOGS); do \
          rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
-         rmdir $(localedir)/$$i/LC_MESSAGES; \
+         rmdir $(localedir)/$$i/LC_MESSAGES || true; \
        done
 

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 4872dd69f9f021b796d702e4686f53e9cc2a9ae4..d5a78f9a0b6e5fbc188eab87576598909606d118 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -33,7 +33,7 @@ def program_id ():
        return '%s version %s' %(program_name,  version);
 
 def identify ():
-       sys.stdout.write (program_id () + '\n')
+       sys.stderr.write (program_id () + '\n')
 
 def gulp_file(f):
        try:

diff --git a/stepmake/Documentation/topdocs/AUTHORS.yo b/stepmake/Documentation/topdocs/AUTHORS.yo
index e14f5d0a10126e8a16de16de8820b21aa87354e0..b8d45e1ae852a94ccad4a752f448e614b3957621 100644 (file)
--- a/stepmake/Documentation/topdocs/AUTHORS.yo
+++ b/stepmake/Documentation/topdocs/AUTHORS.yo
@@ -9,7 +9,7 @@ This file lists authors of StepMake, and what they wrote.
 nsect(AUTHORS)
 itemize(
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org),
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
     nl()
     Main author.
 it()nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), 

diff --git a/stepmake/NEWS b/stepmake/NEWS
index f837a4f5720b5254e204fea0c90cf73f3744e13d..5d3ecc36f75eeef1e15f062b706e833f733c2f44 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,6 @@
+pl 42
+       - fake-msgfmt.sh; urg copied from fake-yodl
+
 pl 41
        - standard naming: _FILES
        - use install-sh

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 0f54b68df8b877e0ac02d4f08e78a27ecd618f05..dbcb4d30d29a0c68a1ed781f3a84257816c0cec3 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -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
 ])
@@ -350,17 +353,21 @@ AC_DEFUN(AC_STEPMAKE_MAN, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [
-    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    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="touch $@; echo "
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
        AC_MSG_RESULT(no)
        AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
     fi
+    if test ! -n "$MSGFMT"; then
+       AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
@@ -420,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.

diff --git a/stepmake/bin/fake-msgfmt.sh b/stepmake/bin/fake-msgfmt.sh
new file mode 100644 (file)
index 0000000..1a97f8d
--- /dev/null
+++ b/stepmake/bin/fake-msgfmt.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+IDENTIFICATION=fake-msgfmt.sh
+
+OUTPUT='/dev/null'
+
+while getopts ':d:o:' OPT;
+do
+case $OPT in
+o)
+    OUTPUT=$OPTARG
+    ;;
+*)
+    ;;
+    esac
+done
+
+
+
+shift `expr $OPTIND - 1`
+#
+# Input file name
+#
+if [ "$1" = "" ]
+then
+  echo "$IDENTIFICATION: No input file name given"
+  exit 1
+fi
+
+echo Faking msgfmt: copying $1 to $OUTPUT
+
+
+cp $1 $OUTPUT

diff --git a/stepmake/bin/fake-yodl.sh b/stepmake/bin/fake-yodl.sh
index f28f6025e49ada4bccac45da2c16f2115dadc678..d865baa919f1d18c222085a540f1d0c71db14bad 100644 (file)
--- a/stepmake/bin/fake-yodl.sh
+++ b/stepmake/bin/fake-yodl.sh
@@ -30,4 +30,5 @@ fi
 echo Faking Yodl: copying $1 to $OUTPUT
 
 
-cp $1 $OUTPUT
+echo THIS IS A SURROGATE. Please install YODL for a formatted document  > $OUTPUT
+cat $1 >> $OUTPUT

diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index 23f15f87a256f641df82608879635b5258f7ff38..25bfe5945aaafa765240ea9e9e47bf9279339006 100644 (file)
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -4,7 +4,6 @@
 
 package-depth = @package_depth@
 
-INSTALL = @INSTALL@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
 USER_LDFLAGS = 
 
@@ -39,6 +38,7 @@ DEFS = @DEFS@
 DEFINES = @DEFS@ @DEFINES@
 COMPILEINFO = @COMPILEINFO@
 DOTEXE = @DOTEXE@
+INSTALL = @INSTALL@
 BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@

diff --git a/stepmake/configure b/stepmake/configure
index d77a257f2af872bb6a676a0af0319cdf4b54a0da..ee022aefa9f1c36aa24a13a9d1b8c8990646132f 100755 (executable)
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -860,13 +860,16 @@ 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
     
     
     
+    
 
     
     if test "$datadir" = "\${prefix}/share"; then
@@ -923,7 +926,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:927: checking language" >&5    
+echo "configure:930: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;
@@ -955,7 +958,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:959: checking for $ac_word" >&5
+echo "configure:962: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -989,7 +992,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:993: checking for $ac_word" >&5
+echo "configure:996: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1023,7 +1026,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1027: checking for $ac_word" >&5
+echo "configure:1030: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1056,7 +1059,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1060: checking for $ac_word" >&5
+echo "configure:1063: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1090,7 +1093,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1094: checking for $ac_word" >&5
+echo "configure:1097: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1124,7 +1127,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1128: checking for $ac_word" >&5
+echo "configure:1131: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1162,6 +1165,12 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
        
        export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
     fi
+    if test "x$YODL" = "-echo no yodl"; then
+       
+    echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2
+    warn_b=yes
+
+    fi    
 
 
 # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk]))
@@ -1172,7 +1181,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1176: checking for $ac_word" >&5
+echo "configure:1185: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1356,6 +1365,7 @@ s%@PYTHON@%$PYTHON%g
 s%@DOTEXE@%$DOTEXE%g
 s%@ZIP@%$ZIP%g
 s%@LN@%$LN%g
+s%@INSTALL@%$INSTALL%g
 s%@DIR_DATADIR@%$DIR_DATADIR%g
 s%@YODL@%$YODL%g
 s%@YODL2HTML@%$YODL2HTML%g

diff --git a/stepmake/stepmake/Documentation.shared.make b/stepmake/stepmake/Documentation.shared.make
index 1a8ee9b02ac298fa349da6579ddc12fe25255142..1a29861d7904e6bafc2b2b4d6b1a4336286d0758 100644 (file)
--- a/stepmake/stepmake/Documentation.shared.make
+++ b/stepmake/stepmake/Documentation.shared.make
@@ -39,7 +39,7 @@ $(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES)
        $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
 
 localinstall: # $(INFO_FILES)
-       $(INSTALL) -d $(infodir)
+       -$(INSTALL) -d $(infodir)
        $(INFOINSTALL)
 localuninstall:
        $(INFOINSTALL)

diff --git a/stepmake/stepmake/Executable.make b/stepmake/stepmake/Executable.make
index 1516ad7eb7c71e1288e18c81c36df77531577911..3feadc553a61cd824c59109c096bf4381d444235 100644 (file)
--- a/stepmake/stepmake/Executable.make
+++ b/stepmake/stepmake/Executable.make
@@ -18,9 +18,9 @@ localinstall: installexe
 localuninstall: uninstallexe
 
 installexe: all
-       $(INSTALL) -d $(bindir)
+       -$(INSTALL) -d $(bindir)
        $(foreach a, $(EXECUTABLES), \
-               $(INSTALL) -m 755 $(outdir)/$(a) $(bindir)/$(a)$(DOTEXE) && \
+               $(INSTALL) -m 755 $(outdir)/$(a)$(DOTEXE) $(bindir)/$(a)$(DOTEXE) && \
                strip $(bindir)/$(a)$(DOTEXE) && ) true
        $(foreach a, $(SEXECUTABLES), \
                $(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true

diff --git a/stepmake/stepmake/Install_outfiles.make b/stepmake/stepmake/Install_outfiles.make
index 53b2321dc7acbeac7b50240c0d55a38317ed36dd..b4f2539f8cea25d53ec4b4f6c7707da073ee0ca9 100644 (file)
--- a/stepmake/stepmake/Install_outfiles.make
+++ b/stepmake/stepmake/Install_outfiles.make
@@ -3,7 +3,7 @@
 localinstall: localinstall-files
 
 localinstall-files: $(INSTALLATION_OUT_FILES)
-       $(INSTALL) -d $(INSTALLATION_OUT_DIR)
+       -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
        $(foreach i, $(INSTALLATION_OUT_FILES), \
                $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true
 

diff --git a/stepmake/stepmake/Installfiles.make b/stepmake/stepmake/Installfiles.make
index 93d4083fe2a7f4227d58817e420c021ced08ecaa..58d10e30cf0e090cac5833694bba1d57b67dd1bb 100644 (file)
--- a/stepmake/stepmake/Installfiles.make
+++ b/stepmake/stepmake/Installfiles.make
@@ -3,13 +3,13 @@
 localinstall: localinstall-files
 
 localinstall-files:
-       $(INSTALL) -d $(INSTALLATION_DIR)
+       -$(INSTALL) -d $(INSTALLATION_DIR)
        $(foreach i,  $(INSTALLATION_FILES),\
                $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
 
 localuninstall: localuninstall-files
 
 localuninstall-files:
-       $(foreach i,  $(INSTALLATION_FILES),
+       $(foreach i,  $(INSTALLATION_FILES),\
                rm -f $(INSTALLATION_DIR)/$(i) && ) true
        -rmdir $(INSTALLATION_DIR)

diff --git a/stepmake/stepmake/Manual.make b/stepmake/stepmake/Manual.make
index 5186b1d8cd9a3ff89587e8382bfeb26779611e22..0e6206dabf068750695fd925eb29383982e883bd 100644 (file)
--- a/stepmake/stepmake/Manual.make
+++ b/stepmake/stepmake/Manual.make
@@ -3,7 +3,7 @@
 MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION)))
 
 localinstall: $(MANGROFFS)
-       $(INSTALL) -d $(mandir)/man$(SECTION)
+       -$(INSTALL) -d $(mandir)/man$(SECTION)
        $(INSTALL) -m 644 $(MANGROFFS) $(mandir)/man$(SECTION)
 
 

diff --git a/stepmake/stepmake/Po.make b/stepmake/stepmake/Po.make
new file mode 100644 (file)
index 0000000..c5e22d1
--- /dev/null
+++ b/stepmake/stepmake/Po.make
@@ -0,0 +1,35 @@
+
+
+####
+#### UGH!
+new-po:
+       if test -r $(po-dir); then \
+         rm -f $(po-dir)/$(outdir)/$(package).po; \
+         touch $(po-dir)/$(outdir)/$(package).po; \
+       fi
+
+ifeq ($(strip $(depth)),.)
+po: new-po
+       $(LOOP)
+localpo:
+       @true
+else
+po: localpo
+       $(LOOP)
+ALL_PO_SOURCES = $(ALL_C_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc)
+localpo:
+ifneq ($(strip $(ALL_PO_SOURCES)),)
+       @echo $(ALL_PO_SOURCES)
+       xgettext --c++ --default-domain=$(package) --join \
+        --output-dir=$(po-dir)/$(outdir) --add-comments \
+        --keyword=_ --keyword=_f $(ALL_PO_SOURCES)
+endif
+endif
+
+
+po-update: po
+       $(MAKE) -C $(po-dir) po-update
+
+show-po-changes:
+       $(MAKE) -C $(po-dir) show-po-changes
+

diff --git a/stepmake/stepmake/Targets.make b/stepmake/stepmake/Targets.make
index 43d9877f182e4b12427f1896aaae2aa14b429020..ed386b70e8f8f2628a0ed416655123fc794f7c73 100644 (file)
--- a/stepmake/stepmake/Targets.make
+++ b/stepmake/stepmake/Targets.make
@@ -24,35 +24,8 @@ maintainerclean:
        $(MAKE) local-maintainerclean
        $(MAKE) local-distclean
 
-new-po:
-       if test -r $(po-dir); then \
-         rm -f $(po-dir)/$(outdir)/$(package).po; \
-         touch $(po-dir)/$(outdir)/$(package).po; \
-       fi
+include $(stepdir)/Po.make
 
-ifeq ($(strip $(depth)),.)
-po: new-po
-       $(LOOP)
-localpo:
-       @true
-else
-po: localpo
-       $(LOOP)
-ALL_PO_SOURCES = $(ALL_C_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc)
-localpo:
-ifneq ($(strip $(ALL_PO_SOURCES)),)
-       @echo $(ALL_PO_SOURCES)
-       xgettext --c++ --default-domain=$(package) --join \
-        --output-dir=$(po-dir)/$(outdir) --add-comments \
-        --keyword=_ --keyword=_f $(ALL_PO_SOURCES)
-endif
-endif
-
-po-update: po
-       $(MAKE) -C $(po-dir) po-update
-
-show-po-changes:
-       $(MAKE) -C $(po-dir) show-po-changes
 
 # configure:
 #
@@ -120,7 +93,8 @@ check-state-vector:
        fi
 
 
-localdist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
+local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
+       mkdir $(distdir)/$(localdir)
        $(LN) $(DIST_FILES) $(distdir)/$(localdir)
 
 #UGH UGH . make ifdef doesn't mix with string substitution semantics (late expansion vs. early expansion)
@@ -132,8 +106,7 @@ localdist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
                mkdir $(distdir)/$(localdir)/out; \
                $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out; \
        fi
-       $(foreach i, $(SUBDIRS), mkdir $(distdir)/$(localdir)/$(i); \
-           $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) localdist &&) true
+       $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
 
 
 
@@ -176,7 +149,7 @@ uninstall: localuninstall
 localuninstall:
 
 installextradoc:
-       $(INSTALL) -d $(prefix)/doc/$(package)
+       -$(INSTALL) -d $(prefix)/doc/$(package)
        $(foreach i, $(EXTRA_DOC_FILES),\
                cp -r $(i) $(prefix)/doc/$(package) &&) true
 
@@ -192,3 +165,8 @@ $(outdir)/dummy.dep:
        -mkdir $(outdir)
        touch $(outdir)/dummy.dep
 
+
+check: local-check
+       $(LOOP)
+
+local-check:

diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/Toplevel.make
index 52d1256221e995c92bfdefa58f30eb2ef149a65e..00ae42bf779147c47c08560331522c1bebe9b929 100644 (file)
--- a/stepmake/stepmake/Toplevel.make
+++ b/stepmake/stepmake/Toplevel.make
@@ -7,7 +7,7 @@
 DIST_FILES := $(EXTRA_DIST_FILES) 
 #
 
-localdist: configure 
+local-dist: configure 
 
 local-distclean: 
        rm -f config.hh config.make Makefile config.cache \
@@ -46,8 +46,7 @@ WWW-clean:
 
 dist:  check-state-vector
        rm -rf $(distdir)
-       -mkdir $(distdir)
-       $(MAKE) localdist $(distdir)
+       $(MAKE) local-dist $(distdir)
        chmod -R a+r $(distdir)
        chmod  a+x `find $(distdir) -type d -print` 
        (cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)

diff --git a/stepmake/stepmake/Variables.make b/stepmake/stepmake/Variables.make
index 59e84b210a1add23103daa3cab6c9079b10e41fa..16b227db458760df480c02f8ecf69e5d3381f0f2 100644 (file)
--- a/stepmake/stepmake/Variables.make
+++ b/stepmake/stepmake/Variables.make
@@ -43,8 +43,8 @@ doc-dir = $(depth)/Documentation
 make-dir = $(depth)/make
 po-dir = $(depth)/po
 
-# -c is for copying
-INSTALL = $(stepdir)/../bin/install-sh -c
+# -c is for copying (now set in config.make)
+# INSTALL = $(stepdir)/../bin/install-sh -c
 
 # user settings:
 #