From a0b7da7978512482b0eba1e038953c821c84ea84 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 7 Nov 2005 18:07:12 +0000
Subject: [PATCH] 	* doc/Makefile.am (asconfig.texi): Set top_srcdir. 
 * doc/Makefile.in: Regenerated. 	* doc/as.texinfo: Document "@FILE".

---
 gas/ChangeLog       | 6 ++++++
 gas/doc/Makefile.am | 5 ++---
 gas/doc/Makefile.in | 5 ++---
 gas/doc/as.texinfo  | 7 +++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e1d2fe7..010cd72 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* doc/Makefile.am (asconfig.texi): Set top_srcdir.
+	* doc/Makefile.in: Regenerated.
+	* doc/as.texinfo: Document "@FILE".
+
 2005-11-07  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/1568
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index bc25e88..14770d5 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -19,9 +19,8 @@ info_TEXINFOS = as.texinfo
 
 asconfig.texi: $(CONFIG).texi
 	rm -f asconfig.texi
-	ln -s $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || ln $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
+	cp $(srcdir)/$(CONFIG).texi ./asconfig.texi	
+	echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi
 
 CPU_DOCS = \
 	c-alpha.texi \
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index bddd088..d8d4419 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -576,9 +576,8 @@ uninstall-man: uninstall-man1
 
 asconfig.texi: $(CONFIG).texi
 	rm -f asconfig.texi
-	ln -s $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || ln $(srcdir)/$(CONFIG).texi ./asconfig.texi >/dev/null 2>&1 \
-	  || cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
+	cp $(srcdir)/$(CONFIG).texi ./asconfig.texi	
+	echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi
 
 gasver.texi: $(srcdir)/../../bfd/configure
 	rm -f $@
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 09b844e..cb1c26b 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -231,8 +231,9 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
  [@b{--listing-cont-lines}=@var{NUM}] [@b{--keep-locals}] [@b{-o}
  @var{objfile}] [@b{-R}] [@b{--reduce-memory-overheads}] [@b{--statistics}]
  [@b{-v}] [@b{-version}] [@b{--version}] [@b{-W}] [@b{--warn}]
- [@b{--fatal-warnings}] [@b{-w}] [@b{-x}] [@b{-Z}] [@b{--target-help}]
- [@var{target-options}] [@b{--}|@var{files} @dots{}]
+ [@b{--fatal-warnings}] [@b{-w}] [@b{-x}] [@b{-Z}] [@b{@@@var{FILE}}]
+ [@b{--target-help}] [@var{target-options}]
+ [@b{--}|@var{files} @dots{}]
 @c
 @c Target dependent options are listed below.  Keep the list sorted.
 @c Add an empty line for separation. 
@@ -450,6 +451,8 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @c man begin OPTIONS
 
 @table @gcctabopt
+@include @value{top_srcdir}/../libiberty/at-file.texi
+
 @item -a[cdhlmns]
 Turn on listings, in any of a variety of ways:
 
-- 
2.7.4