From 4075ff4a7b21aa2a0f46f466129618187b5ae9c3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 12 Oct 2006 13:28:58 +0000
Subject: [PATCH] * lexer-gcc-3.1.sh: Remove.

* Documentation/topdocs/INSTALL.texi: Remove obsolete ftp server.
Update anonymous cvs access.  Remove comment about gcc 3.0.4.
---
 ChangeLog                          |  7 +++
 Documentation/topdocs/INSTALL.texi |  8 +--
 lexer-gcc-3.1.sh                   | 78 ------------------------------
 3 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100755 lexer-gcc-3.1.sh

diff --git a/ChangeLog b/ChangeLog
index 5ce6fa8555..1059aecbda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-12  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lexer-gcc-3.1.sh: Remove.
+
+	* Documentation/topdocs/INSTALL.texi: Remove obsolete ftp server.
+	Update anonymous cvs access.  Remove comment about gcc 3.0.4.
+
 2006-10-12  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* lily/paper-column-engraver.cc (stop_translation_timestep): also
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 804355a3e4..d4a2bb4dec 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -32,14 +32,13 @@ Download source
 @item tarballs from
 @itemize @bullet
 @uref{http://lilypond.org/download/} by HTTP.
-@item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror).
 @end itemize
 @item 
 CVS from @uref{http://savannah.gnu.org/cvs/?group=lilypond,savannah.gnu.org}
 @itemize @bullet
 @c @quotation
 @example
-CVS_RSH=ssh cvs -d:ext:anoncvs@@savannah.gnu.org:/cvsroot/lilypond co lilypond
+CVS_RSH=ssh cvs -d:pserver:anonymous@cvs.savannah.gnu.org:/cvsroot/lilypond co lilypond
 @end example
 @c @end quotation
 The CVS repository does not contain generated files.  To create
@@ -287,11 +286,6 @@ $ make
 @end quotation
 
 
-
-@unnumberedsubsec Gcc-3.0.4
-
-Gcc 3.0.4 is flaky; upgrade GCC.
-
 @unnumberedsubsec Flex-2.5.4a and gcc-3.x
 
 Flex 2.5.4a does not produce g++-3.1.1 compliant C++ code.  To compile
diff --git a/lexer-gcc-3.1.sh b/lexer-gcc-3.1.sh
deleted file mode 100755
index 1898f27eb8..0000000000
--- a/lexer-gcc-3.1.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# script documenting fixes for flex-2.5.4 and gcc-3.1
-
-set -e
-
-FLEXLEXER=OK
-
-if [ -z "$FLEXLEXER" ]; then
-
-includes="$HOME/usr/include $PREFIX/include /usr/local/include /usr/include" 
-
-for i in $includes; do
-    file=$i/FlexLexer.h
-    if [ -f "$file" ]; then
-	break
-    else
-	file=
-    fi
-done
-
-if [ -z "$file" ]; then
-    cat <<EOF
-FlexLexer.h not found in $includes
-
-Please install flex, or find and fix FlexLexer.h by hand.
-EOF
-    exit 1
-fi
-
-fi # flexlexer
-
-if [ -n "$CONF" ]; then
-    CONFIGSUFFIX=-$CONF
-    SETCONF="CONF=$CONF "
-    setconf="conf=$CONF "
-    ENABLECONFIG="--enable-config=$CONF "
-fi    
-outdir=out$CONFIGSUFFIX
-
-if [ -z "$FLEXLEXER" ]; then
-
-echo -n "Copying and fixing $file... "
-mkdir -p lily/$outdir
-rm -f lily/$outdir/FlexLexer.h
-perl -p -e 's/iostream.h/iostream/g;' \
-    -e 's/\bistream\b/std::istream/g;' \
-    -e 's/\bostream\b/std::ostream/' \
-    $file > lily/$outdir/FlexLexer.h
-echo "done"
-
-fi # flexlexer
-
-if [ -f GNUmakefile ]; then
-    file=lily/$outdir/lexer.cc
-    echo -n "Generating and fixing $file... "
-    rm -f $file
-    make conf=$CONF -C lily $outdir/lexer.cc > /dev/null 2>&1 || true
-
-    mv $file $file.orig
-    perl -p -e 's/\bcin\b/std::cin/g;' \
-	-e 's/\bcout\b/std::cout/g;' \
-	-e 's/\bcerr\b/std::cerr/g' \
-	$file.orig > $file
-    echo "done"
-fi
-
-cat <<EOF
-
-Remove config.cache before rerunning ./configure
-
-Reconfigure, refix, and make doing something like:
-
-    rm -f config.cache
-    CPPFLAGS=-I$(pwd)/lily/$outdir ./configure $ENABLECONFIG
-    $SETCONF$0
-    make $setconf
-EOF
-- 
2.39.5