This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[PATCH] Fix libjava/classpath/doc/*.texinfo @direntry entries
- From: Jakub Jelinek <jakub at redhat dot com>
- To: Tom Tromey <tromey at redhat dot com>, Andrew Haley <aph at redhat dot com>
- Cc: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Mon, 18 Feb 2008 09:33:27 -0500
- Subject: [PATCH] Fix libjava/classpath/doc/*.texinfo @direntry entries
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!
2007-02-19 Dalibor Topic <robilad@kaffe.org>
* cp-hacking.texinfo, cp-tools.texinfo,
cp-vmintegration.texinfo: Prefix output file name
with cp.
commit (imported into gcc after 4.2 was branched) changed the filenames
of installed info files (a good idea, e.g. tools is too generic), but hasn't
changed their @direntry entries. This means if you
install-info --info-dir=/usr/share/info /usr/share/info/cp-tools.info
info
will show an entry for Classpath Tools, which can't be dereferenced, as
there is no tools.info. This is a regression from 4.2 where the info files
were names tools.info etc. and so the /usr/share/info/dir entry was
dereferenceable. Only cp-tools.info* is installed, so just that file
matters, but it doesn't hurt to fix the others too.
For cp-tools.texinfo this also adjusts the entry so that description starts
at column 32 (0 based) as recommended in info texinfo, the other entries are
too long, but not installed anyway, so it is less an issue there.
Ok for 4.3?
2008-02-18 Jakub Jelinek <jakub@redhat.com>
* doc/cp-tools.texinfo (@direntry): Prefix info name with cp-.
* doc/cp-hacking.texinfo (@direntry): Likewise.
* doc/cp-vmintegration.texinfo (@direntry): Likewise.
--- gcc/libjava/classpath/doc/cp-tools.texinfo.jj 2007-04-01 20:16:54.000000000 +0200
+++ gcc/libjava/classpath/doc/cp-tools.texinfo 2008-02-18 15:19:12.000000000 +0100
@@ -27,7 +27,7 @@ Copyright (C) 2006, 2007 Free Software F
@ifnotplaintext
@dircategory GNU Libraries
@direntry
-* Classpath Tools: (tools). GNU Classpath Tools Guide
+* Classpath Tools: (cp-tools). GNU Classpath Tools Guide
@end direntry
@end ifnotplaintext
@end ifinfo
--- gcc/libjava/classpath/doc/cp-hacking.texinfo.jj 2007-06-06 12:54:50.000000000 +0200
+++ gcc/libjava/classpath/doc/cp-hacking.texinfo 2008-02-18 15:19:00.000000000 +0100
@@ -16,7 +16,7 @@ Copyright (C) 1998,1999,2000,2001,2002,2
@ifnotplaintext
@dircategory GNU Libraries
@direntry
-* Classpath Hacking: (hacking). GNU Classpath Hacker's Guide
+* Classpath Hacking: (cp-hacking). GNU Classpath Hacker's Guide
@end direntry
@end ifnotplaintext
@end ifinfo
--- gcc/libjava/classpath/doc/cp-vmintegration.texinfo.jj 2007-06-06 12:54:50.000000000 +0200
+++ gcc/libjava/classpath/doc/cp-vmintegration.texinfo 2008-02-18 15:19:29.000000000 +0100
@@ -17,7 +17,7 @@ Copyright (C) 1998-2002, 2004, 2005, 200
@ifnotplaintext
@dircategory GNU Libraries
@direntry
-* VM Integration: (vmintegration). GNU Classpath VM Integration Guide
+* VM Integration: (cp-vmintegration). GNU Classpath VM Integration Guide
@end direntry
@end ifnotplaintext
@end ifinfo
Jakub