* doc/Makefile.am (asconfig.texi): Set top_srcdir.

	* doc/Makefile.in: Regenerated.
	* doc/as.texinfo: Document "@FILE".

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e1d2fe70efdc6e1407610202523338def478e80b..010cd72f7c5650118d44e6d1b01ae7ae116f12bf 100644 (file)
--- 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 bc25e886dfa2cbf0052c4687819b0927418bef90..14770d51a44e702fa2ae558f50b4f60a9950130a 100644 (file)
--- 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 bddd0881181e3e95a52908067f6917443d00086d..d8d4419576883bf532d893a2d57e34a34b494582 100644 (file)
--- 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 09b844ea6bc48dfea434065e2e8e6d1206c392d7..cb1c26b062e73b642565487f238718e31bed4541 100644 (file)
--- 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: