9 files changed, 42 insertions, 30 deletions
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 93835c7..87e2a2e 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Matthias Klose  <doko@ubuntu.com>
+
+	* bfd.texinfo: Add directory section for info document.
+
 2010-05-07  Tristan Gingold  <gingold@adacore.com>
 
 	* Makefile.in: Regenerate with automake 1.11.1.
diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
index ce1c5af..45ffa73 100644
--- a/bfd/doc/bfd.texinfo
+++ b/bfd/doc/bfd.texinfo
@@ -6,13 +6,12 @@
 @c 
 @synindex fn cp
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
+@ifnottex
+@dircategory Software development
+@direntry
 * Bfd: (bfd).                   The Binary File Descriptor library.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@end direntry
+@end ifnottex
 
 @copying
 This file documents the BFD library.
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5ac943a..c328e88 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Matthias Klose  <doko@ubuntu.com>
+
+	* doc/as.texinfo: Add directory section for info document.
+
 2010-10-28  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* config/tc-s390.c (md_begin): Only add to hash table if cpu and
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index a0776e7..3b78dc6 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -87,14 +87,13 @@
 @c might as well show 'em anyways.
 @end ifinfo
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
+@ifnottex
+@dircategory Software development
+@direntry
 * As: (as).                     The GNU assembler.
 * Gas: (as).                    The GNU assembler.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@end direntry
+@end ifnottex
 
 @finalout
 @syncodeindex ky cp
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 58b02c1..a97a571 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Matthias Klose  <doko@ubuntu.com>
+
+	* gprof.texi: Add directory section for info document.
+
 2010-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
diff --git a/gprof/gprof.texi b/gprof/gprof.texi
index 70c4f88..7485687 100644
--- a/gprof/gprof.texi
+++ b/gprof/gprof.texi
@@ -10,15 +10,14 @@
 @include bfdver.texi
 @c man end
 
-@ifinfo
+@ifnottex
 @c This is a dir.info fragment to support semi-automated addition of
 @c manuals to an info tree.  zoo@cygnus.com is developing this facility.
-@format
-START-INFO-DIR-ENTRY
+@dircategory Software development
+@direntry
 * gprof: (gprof).                Profiling your program's execution
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@end direntry
+@end ifnottex
 
 @copying
 This file documents the gprof profiler of the GNU system.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index fef8d80..0ee2ed7 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-28  Matthias Klose  <doko@ubuntu.com>
+
+	* ld.texinfo: Add directory section for info document.
+	* ldint.texinfo: Likewise.
+
 2010-10-28  Alan Modra  <amodra@gmail.com>
 
 	* emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern): For
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index 36e2460..4c58e48 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -39,13 +39,12 @@
 @end ifset
 @c man end
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
+@ifnottex
+@dircategory Software development
+@direntry
 * Ld: (ld).                       The GNU linker.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@end direntry
+@end ifnottex
 
 @copying
 This file documents the @sc{gnu} linker LD
diff --git a/ld/ldint.texinfo b/ld/ldint.texinfo
index 9b5182b..19272c5 100644
--- a/ld/ldint.texinfo
+++ b/ld/ldint.texinfo
@@ -4,13 +4,12 @@
 @c 2003, 2005, 2006, 2007
 @c Free Software Foundation, Inc.
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
+@ifnottex
+@dircategory Software development
+@direntry
 * Ld-Internals: (ldint).	The GNU linker internals.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@end direntry
+@end ifnottex
 
 @copying
 This file documents the internals of the GNU linker ld.