From e1d4c0e465a4171e654d01db103d00136998924a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:13:34 +0000 Subject: [PATCH] lilypond-1.0.2 --- Documentation/README-W32.yo | 4 +- Documentation/links.yo | 4 +- Documentation/man/Makefile | 4 +- Documentation/man/lilypond.yo | 2 +- Documentation/man/mi2mu.yo | 2 +- Documentation/topdocs/AUTHORS.yo | 2 +- aclocal.m4 | 14 +- config.make.in | 1 + configure | 145 +++++++++++--------- init/score-paper.ly | 2 +- input/Makefile | 3 + lily/text-def.cc | 3 + mf/Makefile | 4 + mutopia/Coriolan/Makefile | 4 +- mutopia/standchen.ly | 41 +++--- po/Makefile | 2 +- scripts/convert-mudela.py | 2 +- stepmake/Documentation/topdocs/AUTHORS.yo | 2 +- stepmake/NEWS | 3 + stepmake/aclocal.m4 | 14 +- stepmake/bin/fake-msgfmt.sh | 33 +++++ stepmake/bin/fake-yodl.sh | 3 +- stepmake/config.make.in | 2 +- stepmake/configure | 26 ++-- stepmake/stepmake/Documentation.shared.make | 2 +- stepmake/stepmake/Executable.make | 4 +- stepmake/stepmake/Install_outfiles.make | 2 +- stepmake/stepmake/Installfiles.make | 4 +- stepmake/stepmake/Manual.make | 2 +- stepmake/stepmake/Po.make | 35 +++++ stepmake/stepmake/Targets.make | 42 ++---- stepmake/stepmake/Toplevel.make | 5 +- stepmake/stepmake/Variables.make | 4 +- 33 files changed, 268 insertions(+), 154 deletions(-) create mode 100644 stepmake/bin/fake-msgfmt.sh create mode 100644 stepmake/stepmake/Po.make diff --git a/Documentation/README-W32.yo b/Documentation/README-W32.yo index 1523309d65..506be7899a 100644 --- 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().tar.gz diff --git a/Documentation/links.yo b/Documentation/links.yo index acabea0e7b..d0b9a87ca7 100644 --- 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 a3157a3eb9..1460196b88 100644 --- 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 c027f6c6f5..b0bb0316ae 100644 --- 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 85decf245a..14d3d7d3b4 100644 --- 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 b1c6ec64bd..4db956cde2 100644 --- 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 0f54b68df8..dbcb4d30d2 100644 --- 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 9aecaf66f2..25bfe5945a 100644 --- 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 2dd916582d..493ae9c0e3 100755 --- 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 <&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 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 <&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 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 < struct foo { static int baz; }; @@ -1446,7 +1449,7 @@ int main() { return foo::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 <&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 <&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 <&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 <&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 <&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 <&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 f0e4783822..f4e170a732 100644 --- 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 b557d18d4b..1919c9e343 100644 --- 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 faf0dae1c4..b0dbaf5611 100644 --- 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 42c18fec88..407ce8ea27 100644 --- 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 dc9e90a472..4363beefe8 100644 --- 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 64f5e71d68..185e298a39 100644 --- 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> | r8 <[f a c> | r8 <[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 } > | r4 | } @@ -243,7 +245,7 @@ $treble_through = \melodic\relative c{ r8 <[f,\p a c> | %70 r8 <[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 } > | r4 | r4 | r4 | @@ -328,8 +330,8 @@ $bass_through = \melodic\relative c{ <[d'' g> | c,8 <[c' e g> | - <[c' es! g> | - <[d'' f> | + <[c' es! g> | + <[d'' f> | %75 <[d'' f> | c,8 <[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 d951b5a320..e0c550371e 100644 --- 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 4872dd69f9..d5a78f9a0b 100644 --- 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 e14f5d0a10..b8d45e1ae8 100644 --- 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 f837a4f572..5d3ecc36f7 100644 --- 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 0f54b68df8..dbcb4d30d2 100644 --- 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 index 0000000000..1a97f8d510 --- /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 f28f6025e4..d865baa919 100644 --- 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 23f15f87a2..25bfe5945a 100644 --- 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 d77a257f2a..ee022aefa9 100755 --- 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 1a8ee9b02a..1a29861d79 100644 --- 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 1516ad7eb7..3feadc553a 100644 --- 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 53b2321dc7..b4f2539f8c 100644 --- 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 93d4083fe2..58d10e30cf 100644 --- 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 5186b1d8cd..0e6206dabf 100644 --- 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 index 0000000000..c5e22d1f29 --- /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 43d9877f18..ed386b70e8 100644 --- 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 52d1256221..00ae42bf77 100644 --- 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 59e84b210a..16b227db45 100644 --- 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: # -- 2.39.5