From: fred <fred>
Date: Tue, 26 Mar 2002 21:48:34 +0000 (+0000)
Subject: lilypond-1.1.37
X-Git-Tag: release/1.5.59~2507
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=67b900a2a9a3324dbc2d5338ba2f4b8d162df8f9;p=lilypond.git

lilypond-1.1.37
---

diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index 4d5c1ecc18..aaea8b17a7 100644
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -74,3 +74,6 @@ $(outdir)/%.html: %.bib
 
 #out/%: $(outdir)/%
 #	cp -f $< $@
+
+localclean:
+	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
diff --git a/debian/changelog b/debian/changelog
index c31123b6ba..804e47bb20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+lilypond (1.1.36-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/rules]:
+      - Make and install info files.
+      - Removed "CC=egcc" because the default gcc on all platforms is
+        now the one from egcs.
+      - Install *.png instead of *.xpm.
+      - Minor clean-ups.
+  * Added debian/compress to make sure *.png are not compressed.
+  * Added debian/doc-base and postinst/prerm for the LilyPond info files.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 21 Mar 1999 13:39:39 -0700
+
 lilypond (1.1.31-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/copyright b/debian/copyright
index aa4d619705..dcd268aca5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,8 @@
-This package was debianized by Anthony Fok <foka@debian.org> on
+This package was Debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.1/lilypond-1.1.31.tar.gz
-
-It is also available from:
-
-      ftp://sca.uwaterloo.ca/pub/lilypond/development/
+      ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.36.tar.gz
 
 For more information about GNU LilyPond, please visit:
       http://www.cs.uu.nl/~hanwen/lilypond/
diff --git a/debian/postinst b/debian/postinst
index 7f781eb295..ac8e261b95 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -19,6 +19,10 @@ TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
 echo " Running /usr/bin/mktexlsr ..."
 /usr/bin/mktexlsr
 
+install-info --description='LilyPond, the GNU Project music typesetter' \
+	--section "Music" "Music" \
+	--quiet /usr/info/lilypond.info.gz
+
 #DEBHELPER#
 
 # If we are the last package to use the old /usr/lib/texmf/doc,
diff --git a/debian/rules b/debian/rules
index 38207cad73..7a94ca326f 100644
--- a/debian/rules
+++ b/debian/rules
@@ -14,19 +14,6 @@ SHELL = /bin/sh
 r = debian/tmp
 d = usr/doc/$(package)
 
-strayfiles := stepmake/bin/*.pyc \
-	stepmake/stepmake/stepmake \
-	stepmake/stepmake/bin \
-	stepmake/stepmake/aclocal.m4 \
-	stepmake/GNUmakefile \
-	GNUmakefile \
-	config.h \
-	wwwlist \
-	Documentation/tex/fonts.aux \
-	Documentation/tex/fonts.log \
-	Documentation/tex/feta*.tfm \
-	Documentation/tex/feta*.*pk
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -34,15 +21,18 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	CC=egcc ./configure --disable-checking --disable-debugging \
+	./configure --disable-checking --disable-debugging \
 		--enable-printing --prefix=/usr --disable-optimise \
 		--enable-shared
 	$(MAKE) all
-	# $(MAKE) htmldoc
+	$(MAKE) -C Documentation/pictures pngs
 
 	# Remove the "-" and the "-k" once the \times segfault
 	# bug is fixed.  (lilypond-1.1.31, 1999-02-17)
 	-$(MAKE) -k -C Documentation/tex dvi
+	-$(MAKE) -C Documentation info
+
+	# $(MAKE) htmldoc
 
 	touch build-stamp
 
@@ -51,11 +41,9 @@ clean:
 	dh_testroot
 	rm -f build-stamp install-stamp
 	-$(MAKE) distclean
+	rm -f stepmake/stepmake/aclocal.m4
 	dh_clean
 
-	# Remove the following line once the *.make files are fixed
-	rm -f $(strayfiles)
-
 	# Correct the owner of the out/dummy.dep files when built with sudo.
 	if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \
 		find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \
@@ -80,7 +68,7 @@ install-stamp: build-stamp
 	ln -s ../../../share/lilypond/tex $(r)/usr/lib/texmf/tex/lilypond
 	ln -s ../../../../../share/lilypond/mf $(r)/usr/lib/texmf/fonts/source/public/lilypond
 	ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/afm/public/lilypond
-	ln -s ../../../../../share/lilypond/afm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond
+	ln -s ../../../../../share/lilypond/tfm $(r)/usr/lib/texmf/fonts/tfm/public/lilypond
 
 	touch install-stamp
 
@@ -92,9 +80,9 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp
-	dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS-* DEDICATION \
+	dh_installdocs ANNOUNCE* NEWS-* DEDICATION \
 		BUGS TODO *.txt \
-		Documentation/pictures/*.xpm \
+		Documentation/pictures/out/*.png \
 		Documentation/out/*.txt \
 		Documentation/tex/*.doc \
 		Documentation/tex/*.bib \
@@ -110,7 +98,7 @@ binary-arch: build install
 #	dh_installmanpages
 #	dh_undocumented
 	dh_installchangelogs -k NEWS
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_suidregister
diff --git a/stepmake/configure b/stepmake/configure
index becb61e512..94dcac8c34 100755
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -54,11 +54,8 @@ fi
 
 
 
-
-
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -112,6 +109,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -395,7 +393,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -565,9 +563,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -748,7 +748,7 @@ fi
      
     
 # Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
@@ -760,14 +760,14 @@ case "$host_alias" in
 NONE)
   case $nonopt in
   NONE)
-    if host_alias=`$ac_config_guess`; then :
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
     fi ;;
   *) host_alias=$nonopt ;;
   esac ;;
 esac
 
-host=`$ac_config_sub $host_alias`
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
 host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -785,8 +785,9 @@ else
   if test -n "$MAKE"; then
   ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_MAKE="$ac_prog"
@@ -812,15 +813,16 @@ 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:816: checking for $ac_word" >&5
+echo "configure:817: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$FIND"; then
   ac_cv_prog_FIND="$FIND" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_FIND="$ac_prog"
@@ -848,15 +850,16 @@ 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:852: checking for $ac_word" >&5
+echo "configure:854: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$TAR"; then
   ac_cv_prog_TAR="$TAR" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_TAR="$ac_prog"
@@ -882,15 +885,16 @@ 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:886: checking for $ac_word" >&5
+echo "configure:889: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$BASH"; then
   ac_cv_prog_BASH="$BASH" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_BASH="$ac_prog"
@@ -915,7 +919,7 @@ test -n "$BASH" || BASH="/bin/sh"
     # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
 set dummy ${PYTHON:-python}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:919: checking for $ac_word" >&5
+echo "configure:923: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -923,9 +927,13 @@ else
   /*)
   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_PYTHON="$ac_dir/$ac_word"
@@ -1078,7 +1086,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1082: checking language" >&5    
+echo "configure:1090: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
 	    lang=English;;
@@ -1111,15 +1119,16 @@ 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:1115: checking for $ac_word" >&5
+echo "configure:1123: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$STRIPROFF"; then
   ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_STRIPROFF="$ac_prog"
@@ -1145,15 +1154,16 @@ 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:1149: checking for $ac_word" >&5
+echo "configure:1158: 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
   if test -n "$YODL"; then
   ac_cv_prog_YODL="$YODL" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL="$ac_prog"
@@ -1179,15 +1189,16 @@ 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:1183: checking for $ac_word" >&5
+echo "configure:1193: 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
   if test -n "$YODL2HTML"; then
   ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2HTML="$ac_prog"
@@ -1213,15 +1224,16 @@ 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:1217: checking for $ac_word" >&5
+echo "configure:1228: 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
   if test -n "$YODL2LATEX"; then
   ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2LATEX="$ac_prog"
@@ -1246,15 +1258,16 @@ 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:1250: checking for $ac_word" >&5
+echo "configure:1262: 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
   if test -n "$YODL2MAN"; then
   ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2MAN="$ac_prog"
@@ -1280,15 +1293,16 @@ 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:1284: checking for $ac_word" >&5
+echo "configure:1297: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$YODL2MSLESS"; then
   ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2MSLESS="$ac_prog"
@@ -1314,15 +1328,16 @@ 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:1318: checking for $ac_word" >&5
+echo "configure:1332: 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
   if test -n "$YODL2TEXINFO"; then
   ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2TEXINFO="$ac_prog"
@@ -1348,15 +1363,16 @@ 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:1352: checking for $ac_word" >&5
+echo "configure:1367: 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
   if test -n "$YODL2TXT"; then
   ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YODL2TXT="$ac_prog"
@@ -1406,15 +1422,16 @@ 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:1410: checking for $ac_word" >&5
+echo "configure:1426: 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
   if test -n "$MAKEINFO"; then
   ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_MAKEINFO="$ac_prog"
@@ -1462,7 +1479,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -1529,7 +1546,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1548,9 +1565,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
diff --git a/stepmake/make/toplevel.make.in b/stepmake/make/toplevel.make.in
index f471aaee77..306eb8dea2 100644
--- a/stepmake/make/toplevel.make.in
+++ b/stepmake/make/toplevel.make.in
@@ -48,3 +48,7 @@ INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) GNUmakefile config.make config.status
 include $(stepdir)/install-targets.make
 endif
+
+localclean:
+	rm -f bin/*.pyc
+	rm -f stepmake/stepmake stepmake/bin stepmake/aclocal.m4
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 1e739cb3af..ac21d26e76 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -4,8 +4,8 @@
 local-dist: configure 
 
 local-distclean: 
-	rm -f config.hh config.make Makefile config.cache \
-		config.status config.log index.html
+	rm -f config.h config.hh config.make Makefile GNUmakefile \
+		config.cache config.status config.log index.html
 
 local-maintainerclean:
 	rm -f configure
diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make
index a11f4896c1..64e5d4960c 100644
--- a/stepmake/stepmake/yolily-toplevel-targets.make
+++ b/stepmake/stepmake/yolily-toplevel-targets.make
@@ -21,6 +21,8 @@ htmldoc:
 	-ln -f $(depth)/$(distname).diff.gz out-www
 	tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.png out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
 
+localclean:
+	rm -f wwwlist
 
 # if you fix this, please fix yodl too!
 check-top-web:
diff --git a/tex/lilypond-plaintex.tex b/tex/lilypond-plaintex.tex
index 8646103bde..a05d577614 100644
--- a/tex/lilypond-plaintex.tex
+++ b/tex/lilypond-plaintex.tex
@@ -40,7 +40,7 @@
 }   
 
 \def\lilyfooterPlainTeX{
-          \footline={\ifnum\pageno=1\smalltextfont\mudelacopyright\hfil \LilyIdString
+          \footline={\ifnum\pageno=1\smalltextfont\mudelacopyright\hfil \mudelatagline
                 \else\hfil\the\pageno\hfil\fi}%
 }
 \advance\hoffset by -.6in