On Fri, Jun 28, 2002 at 05:49:33PM +0200, Szilveszter Adam wrote:
> Hello Sheldon,
> As far as I know, so far only the ones for GDB (and that only under
> -CURRENT). If you get there first, go for it, but if not, I will also
> look at the issue during the weekend.

To follow up on this: I have got the info files to build based on the
original Makefile in the src/contrib/gdb/gdb/doc/ dir.

The only questions remaining:

1) The GNU folks have a way of generating GDBvn.texi from version.in, so
that it has the same version information than the source code. We use
the GDBvn.texi file supplied with the distribution. (which was not
updated BTW, so it still says 4.18) Do we want to use
this method, or stick with the hard-coded one we are using now? In which
case GDBvn.texi needs updating. 

NB: Arguably, changing this file is only necessary when the GDB version
changes, so maybe updating the file by hand in these rare cases is the 
better solution. I did this now.

2) We generate a file named "inc-hist.texi", but the GNU call this
"inc-hist.texinfo". It is possible to patch the file gdb.texinfo which
includes it, or it is possible to change our target in
src/gnu/usr.bin/binutils/doc/Makefile appropriately. Since it is not
used anywhere else, I decided on the latter. This is also included in
the patch.

This has been tested on an empty /usr/obj with make obj && make && make
clean and did work, furthermore, visiting the newly generated info files
with the info command directly showed that they worked. 

Please, review the patch, and, if you like it, apply it. Please send any
and all comments to me or to the list. (but preferably not to both)

Happy weekend.

Szilveszter ADAM
Szombathely Hungary
Index: Makefile
RCS file: /usr/home/cc/ncvs/freebsd//src/gnu/usr.bin/binutils/doc/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile    28 Jun 2002 03:41:56 -0000      1.11
+++ Makefile    29 Jun 2002 12:38:55 -0000
@@ -5,9 +5,9 @@
 GDBDIR=        ${.CURDIR}/../../../../contrib/gdb
 CONTRIBDIR= ${.CURDIR}/../../../../contrib
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc
+.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc 
-INFO = as ld annotate gasp stabs binutils
+INFO = as ld annotate gasp gdb gdbint stabs binutils
 INFOSECTION=   "Programming & development tools."
 INFOENTRY_as=  "* As: (as).            The GNU assembler."
 INFOENTRY_gasp=        "* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
@@ -19,6 +19,7 @@
 MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc
 MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc
 CLEANFILES=    gdb-cfg.texi inc-hist.texi inc-hist.texi.orig \
@@ -27,9 +28,12 @@
 as.info:       as.texinfo asconfig.texi c-i386.texi gasver.texi
 ld.info:       ld.texinfo bfdsumm.texi ldver.texi
-gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi remote.texi \
-       rluser.texinfo inc-hist.texi
+gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi annotate.texi \
+         fdl.texi gpl.texi gdbmi.texinfo \
+       rluser.texinfo inc-hist.texinfo
+gdbint.info: gdbint.texinfo fdl.texi
 gdb-cfg.texi: all-cfg.texi
        ln -sf ${.ALLSRC} ${.TARGET}
@@ -40,7 +44,7 @@
        echo "@set VERSION ${VERSION}" > ${.TARGET}
 .PATH: ${CONTRIBDIR}/libreadline/doc
-inc-hist.texi: hsuser.texinfo inc-hist.diff
+inc-hist.texinfo: hsuser.texinfo inc-hist.diff
        cp ${.ALLSRC:M*.texinfo} ${.TARGET}
        patch -b .orig < ${.ALLSRC:M*.diff}
Index: inc-hist.diff
RCS file: /usr/home/cc/ncvs/freebsd//src/gnu/usr.bin/binutils/doc/inc-hist.diff,v
retrieving revision 1.3
diff -u -r1.3 inc-hist.diff
--- inc-hist.diff       11 Apr 2001 04:27:10 -0000      1.3
+++ inc-hist.diff       29 Jun 2002 12:20:56 -0000
@@ -1,7 +1,7 @@
 $FreeBSD: src/gnu/usr.bin/binutils/doc/inc-hist.diff,v 1.3 2001/04/11 04:27:10 ache 
Exp $
---- inc-hist.texi.orig Wed Apr 11 08:20:01 2001
-+++ inc-hist.texi      Wed Apr 11 08:21:57 2001
+--- inc-hist.texinfo.orig      Wed Apr 11 08:20:01 2001
++++ inc-hist.texinfo   Wed Apr 11 08:21:57 2001
 @@ -26,9 +26,9 @@
  @node Using History Interactively
  @chapter Using History Interactively
Index: GDBvn.texi
RCS file: /usr/home/cc/ncvs/freebsd//src/contrib/gdb/gdb/doc/GDBvn.texi,v
retrieving revision
diff -u -r1.1.1.2 GDBvn.texi
--- GDBvn.texi  2 May 1999 10:11:49 -0000
+++ GDBvn.texi  29 Jun 2002 12:19:28 -0000
@@ -1 +1 @@
-@set GDBVN 4.18
+@set GDBVN 5.2.0 (FreeBSD) 20020627

Reply via email to