Help stupid cvs fixing basic conflicts.

1 files changed, 6 insertions, 9 deletions

diff --git a/gnu/usr.bin/binutils/README b/gnu/usr.bin/binutils/README
index 7ec34b1a07d..eb0e436d860 100644
--- a/gnu/usr.bin/binutils/README
+++ b/gnu/usr.bin/binutils/README
@@ -4,7 +4,7 @@ This directory contains various GNU compilers, assemblers, linkers,
 debuggers, etc., plus their support routines, definitions, and documentation.
 
 If you are receiving this as part of a GDB release, see the file gdb/README.
-If with a gas release, see gas/README;  if with a libg++ release,
+If with a binutils release, see binutils/README;  if with a libg++ release,
 see libg++/README, etc.  That'll give you info about this
 package -- supported targets, how to use it, how to report bugs, etc.
 
@@ -19,7 +19,7 @@ To install them (by default in /usr/local/bin, /usr/local/lib, etc),
 then do:
 	make install
 
-If the configure script can't determine your type of computer, give it
+(If the configure script can't determine your type of computer, give it
 the name as an argument, for instance ``./configure sun4''.  You can
 use the script ``config.sub'' to test whether a name is recognized; if
 it is, config.sub translates it to a triplet specifying CPU, vendor,
@@ -30,21 +30,18 @@ explicitly set CC in the environment before running configure, and to
 also set CC when running make.  For example (assuming sh/bash/ksh):
 
 	CC=gcc ./configure
-	make CC=gcc
+	make
 
 A similar example using csh:
 
 	setenv CC gcc
 	./configure
-	make CC=gcc
-
-See etc/cfg-paper.texi, etc/configure.texi, and/or the README files in
-various subdirectories, for more details.
+	make
 
 Much of the code and documentation enclosed is copyright by
 the Free Software Foundation, Inc.  See the file COPYING or
 COPYING.LIB in the various directories, for a description of the
 GNU General Public License terms under which you can copy the files.
 
-REPORTING BUGS: Again, see gdb/README, gas/README, etc., for info on where and
-how to report problems.
+REPORTING BUGS: Again, see gdb/README, binutils/README, etc., for info
+on where and how to report problems.