* doc/binutils.texi: Include config.texi and @file documentation

	for manual pages.

	* Makefile.am (gprof.info, gprof.1): Depend on config.texi.
	(config.texi): New file.
	* Makefile.in: Regenerated.

	* Makefile.am (configdoc.texi): Set top_srcdir in configdoc.texi..
	* Makefile.in: Regenerated.
	* ld.texinfo: Include configdoc.texi and ldver.texi in man pages.
	Add @file documentation.

9 files changed, 44 insertions, 9 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a84b9b3..e04e13d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* doc/binutils.texi: Include config.texi and @file documentation
+	for manual pages.
+
 2005-11-15  Jan Beulich  <jbeulich@novell.com>
 
 	* objcopy.c (keep_file_symbols): New.
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index ee5114c..828eb5d 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -2,7 +2,9 @@
 @setfilename binutils.info
 @c Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
+@c man begin INCLUDE
 @include config.texi
+@c man end
 
 @ifinfo
 @format
@@ -3505,8 +3507,10 @@ objdump(1), and the Info entries for @file{binutils}.
 The following command-line options are supported by all of the
 programs described in this manual.
 
+@c man begin OPTIONS
 @table @env
 @include @value{top_srcdir}/../libiberty/at-file.texi
+@c man end
 
 @item --help
 Display the command-line options supported by the program.
@@ -3514,7 +3518,9 @@ Display the command-line options supported by the program.
 @item --version
 Display the version number of the program.
 
+@c man begin OPTIONS
 @end table
+@c man end
 
 @node Selecting The Target System
 @chapter Selecting the Target System
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 0920641..12b41c3 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.am (gprof.info, gprof.1): Depend on config.texi.
+	(config.texi): New file.
+	* Makefile.in: Regenerated.
+
 2005-11-07  Steve Ellcey  <sje@cup.hp.com>
 
 	* configure: Regenerate after modifying bfd/warning.m4.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index f152477..a0e782b 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -58,10 +58,15 @@ POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 info_TEXINFOS = gprof.texi
 man_MANS = gprof.1
 
+$(srcdir)/gprof.info: gprof.texi config.texi
+
+config.texi:
+	echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
+
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-gprof.1: $(srcdir)/gprof.texi
+gprof.1: $(srcdir)/gprof.texi config.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dgprof < $(srcdir)/gprof.texi > gprof.pod
 	-($(POD2MAN) gprof.pod | \
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index b05d372..ff69bfc 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -407,7 +407,6 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
-$(srcdir)/gprof.info: gprof.texi 
 gprof.dvi: gprof.texi 
 gprof.pdf: gprof.texi 
 gprof.html: gprof.texi 
@@ -783,10 +782,15 @@ po/POTFILES.in: @MAINT@ Makefile
 	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
+$(srcdir)/gprof.info: gprof.texi config.texi
+
+config.texi:
+	echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
+
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-gprof.1: $(srcdir)/gprof.texi
+gprof.1: $(srcdir)/gprof.texi config.texi
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Dgprof < $(srcdir)/gprof.texi > gprof.pod
 	-($(POD2MAN) gprof.pod | \
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 68c2d5d..42b4da8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.am (configdoc.texi): Set top_srcdir in configdoc.texi..
+	* Makefile.in: Regenerated.
+	* ld.texinfo: Include configdoc.texi and ldver.texi in man pages.
+	Add @file documentation.
+	
 2005-11-17  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldlang.h (lang_input_section_type): Remove "ifile" field.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 9f79ec9..bd6ca20 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1652,9 +1652,8 @@ bootstrap: ld3$(EXEEXT)
 # because almost all configs use "gen" version of manual.
 #  Set DOCVER above to change.
 configdoc.texi:	${DOCVER}-doc.texi
-	ln -s ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
-	  || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
-	  || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
+	cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
+	echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
diff --git a/ld/Makefile.in b/ld/Makefile.in
index b00cbbf..f9bce2c 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2445,9 +2445,8 @@ bootstrap: ld3$(EXEEXT)
 # because almost all configs use "gen" version of manual.
 #  Set DOCVER above to change.
 configdoc.texi:	${DOCVER}-doc.texi
-	ln -s ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
-	  || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
-	  || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
+	cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
+	echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index c08f692..172ea7a 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -3,9 +3,11 @@
 @c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 @c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 @syncodeindex ky cp
+@c man begin INCLUDE
 @include configdoc.texi
 @c (configdoc.texi is generated by the Makefile)
 @include ldver.texi
+@c man end
 
 @c @smallbook
 
@@ -340,6 +342,8 @@ Here is a table of the generic command line switches accepted by the GNU
 linker:
 
 @table @gcctabopt
+@include @value{top_srcdir}/../libiberty/at-file.texi
+
 @kindex -a@var{keyword}
 @item -a@var{keyword}
 This option is supported for HP/UX compatibility.  The @var{keyword}