From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12780 invoked by alias); 1 Jan 2011 08:08:59 -0000 Received: (qmail 12772 invoked by uid 22791); 1 Jan 2011 08:08:57 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_DB,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; Sat, 01 Jan 2011 08:08:53 +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.13.8/8.13.8) with ESMTP id p0188p4n017646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 1 Jan 2011 03:08:51 -0500 Received: from host1.dyn.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 p0188n4Q016644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 1 Jan 2011 03:08:51 -0500 Received: from host1.dyn.jankratochvil.net (localhost [127.0.0.1]) by host1.dyn.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p0188mtl020717; Sat, 1 Jan 2011 09:08:48 +0100 Received: (from jkratoch@localhost) by host1.dyn.jankratochvil.net (8.14.4/8.14.4/Submit) id p0188mVm020716; Sat, 1 Jan 2011 09:08:48 +0100 Date: Sat, 01 Jan 2011 08:08:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [patch] make info out-of-src-tree regression on --with-system-readline Message-ID: <20110101080848.GA20595@host1.dyn.jankratochvil.net> References: <20110101011319.GA27139@host1.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110101011319.GA27139@host1.dyn.jankratochvil.net> 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-01/txt/msg00002.txt.bz2 On Sat, 01 Jan 2011 02:13:24 +0100, Jan Kratochvil wrote: > Another issue is that GDBvn.texi and gdb-cfg.texi should not be distributed. > But that bug is a different one on top of this bug. That bug of a needless > files distribution is dependent on magic GDB `make dist' I do not know and > also that dist bug is not serious enough. This part has a real consequence - the previous patch does not apply for build trees out of the src tree. It may be even a makeinfo bug. The change below is not needed for texi2dvi. In fact it even breaks it. As Fedora does not package texi2roff I did not test it. Another possibility is to error out if $(srcdir)/GDBvn.texi exists so that no disambiguities may exist. GDBvn.texi would have to be removed from the distributed tars. Comment on this part is more than welcome. This is a regression. Thanks, Jan gdb/doc/ 2011-01-01 Jan Kratochvil Fix out-of-src doc build if using --with-system-readline. * Makefile.in (MAKEINFO): New comment. (gdb.info, gdb/index.html): Remove $(srcdir)/ from gdb.texinfo. --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -45,6 +45,9 @@ gdbdir = $(srcdir)/.. TEXIDIR=${gdbdir}/../texinfo # where to find makeinfo, preferably one designed for texinfo-2 +# Call makeinfo always with gdb.texinfo and not $(srcdir)/gdb.texinfo. +# In the latter case GDBvn.texi would be included also from $(srcdir) even if +# different GDBvn.texi exists in the current directory. MAKEINFO=makeinfo MAKEHTML = $(MAKEINFO) --html @@ -365,7 +368,7 @@ gdb.pdf: ${GDB_DOC_FILES} # GDB MANUAL: info file gdb.info: ${GDB_DOC_FILES} $(MAKEINFO) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ - -o gdb.info $(srcdir)/gdb.texinfo + -o gdb.info gdb.texinfo # GDB MANUAL: roff translations # Try to use a recent texi2roff. v2 was put on prep in jan91. @@ -440,7 +443,8 @@ gdb.mm: $(GDB_DOC_FILES) links2roff # GDB MANUAL: HTML file gdb/index.html: ${GDB_DOC_FILES} - $(MAKEHTML) $(MAKEHTMLFLAGS) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) $(READLINE_TEXI_INCFLAG) \ + -I ${GDBMI_DIR} -I $(srcdir) gdb.texinfo # Clean these up before each run. Avoids a catch 22 with not being # able to re-generate these files (to fix a corruption) because these