From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6965 invoked by alias); 2 May 2011 14:11:41 -0000 Received: (qmail 6957 invoked by uid 22791); 2 May 2011 14:11:40 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 May 2011 14:11:26 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p42EBPwj022580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 May 2011 10:11:25 -0400 Received: from host1.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p42EBNrF009228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 2 May 2011 10:11:25 -0400 Received: from host1.jankratochvil.net (localhost [127.0.0.1]) by host1.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p42EBNJc020197 for ; Mon, 2 May 2011 16:11:23 +0200 Received: (from jkratoch@localhost) by host1.jankratochvil.net (8.14.4/8.14.4/Submit) id p42EBMfv020184 for gdb-patches@sourceware.org; Mon, 2 May 2011 16:11:22 +0200 Date: Mon, 02 May 2011 14:11:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch 4/3] readline-6.2: Substitute inc-hist.texinfo Message-ID: <20110502141121.GA19958@host1.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00010.txt.bz2 Hi, forgot the patchset had a `make doc' regression: make: *** No rule to make target `../../../gdb/doc/../../readline/doc/inc-hist.texinfo', needed by `gdb.info'. Stop. There was a copy hsuser.texi -> inc-hist.texinfo before with this diff: @@ -26,9 +26,9 @@ into another language, under the above c @node Using History Interactively @chapter Using History Interactively -@ifclear BashFeatures -@defcodeindex bt -@end ifclear +@c @ifclear BashFeatures +@c @defcodeindex bt +@c @end ifclear @ifset BashFeatures This chapter describes how to use the @sc{gnu} History Library @@ -39,9 +39,9 @@ see the @sc{gnu} Readline Library Manual @end ifset @ifclear BashFeatures This chapter describes how to use the @sc{gnu} History Library interactively, -from a user's standpoint. It should be considered a user's guide. For -information on using the @sc{gnu} History Library in your own programs, -@pxref{Programming with GNU History}. +from a user's standpoint. It should be considered a user's guide. +For information on using the @sc{gnu} History Library in other programs, +see the @sc{gnu} Readline Library Manual. @end ifclear @ifset BashFeatures Used slightly alternative one with IMO better reference and I have also kept hsuser.texi in place as readline/ in src/ is no longer a standalone readline distribution anyway. Sorry, Jan gdb/doc/ 2011-05-02 Jan Kratochvil * Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to hsuser.texi. * gdb.texinfo : Rename inc-hist.texinfo inclusion and comment to hsuser.texi. Change rluser.texi name in the comment. readline/doc/ 2011-05-02 Jan Kratochvil * hsuser.texi (Using History Interactively): Disable !BashFeatures @defcodeindex. Make the `Programming with GNU History' reference external. --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -117,7 +117,7 @@ GDB_DOC_SOURCE_INCLUDES = \ $(srcdir)/gpl.texi \ $(srcdir)/agentexpr.texi \ $(READLINE_DIR)/rluser.texi \ - $(READLINE_DIR)/inc-hist.texinfo + $(READLINE_DIR)/hsuser.texi GDB_DOC_BUILD_INCLUDES = \ gdb-cfg.texi \ GDBvn.texi --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -31008,13 +31008,13 @@ things without first using the debugger to find the facts. @c The readline documentation is distributed with the readline code @c and consists of the two following files: -@c rluser.texinfo -@c inc-hist.texinfo +@c rluser.texi +@c hsuser.texi @c Use -I with makeinfo to point to the appropriate directory, @c environment var TEXINPUTS with TeX. @ifclear SYSTEM_READLINE @include rluser.texi -@include inc-hist.texinfo +@include hsuser.texi @end ifclear --- a/readline/doc/hsuser.texi +++ b/readline/doc/hsuser.texi @@ -26,9 +26,10 @@ into another language, under the above conditions for modified versions. @node Using History Interactively @chapter Using History Interactively -@ifclear BashFeatures -@defcodeindex bt -@end ifclear +@c GDB bundling modification: +@c @ifclear BashFeatures +@c @defcodeindex bt +@c @end ifclear @ifset BashFeatures This chapter describes how to use the @sc{gnu} History Library @@ -41,7 +42,8 @@ see the @sc{gnu} Readline Library Manual. This chapter describes how to use the @sc{gnu} History Library interactively, from a user's standpoint. It should be considered a user's guide. For information on using the @sc{gnu} History Library in your own programs, -@pxref{Programming with GNU History}. +@c GDB bundling modification: +@pxref{Programming with GNU History, , , history, GNU History Library}. @end ifclear @ifset BashFeatures