From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8973 invoked by alias); 18 Jun 2004 11:35:00 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 8739 invoked from network); 18 Jun 2004 11:34:55 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 18 Jun 2004 11:34:55 -0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i5IBYse1002374; Fri, 18 Jun 2004 07:34:55 -0400 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i5IBYsw20396; Fri, 18 Jun 2004 07:34:54 -0400 Received: from cygbert.vinschen.de (vpn50-39.rdu.redhat.com [172.16.50.39]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id i5IBYqP29034; Fri, 18 Jun 2004 04:34:52 -0700 Received: by cygbert.vinschen.de (Postfix, from userid 500) id 513CD5809C; Fri, 18 Jun 2004 13:34:48 +0200 (CEST) Date: Fri, 18 Jun 2004 11:35:00 -0000 From: Corinna Vinschen To: gdb-patches@sources.redhat.com, newlib@sources.redhat.com, binutils@sources.redhat.com, gcc-patches@gnu.org Subject: [RFA] toplevel: Always use in tree makeinfo in texinfo subdir Message-ID: <20040618113448.GF593@cygbert.vinschen.de> Mail-Followup-To: gdb-patches@sources.redhat.com, newlib@sources.redhat.com, binutils@sources.redhat.com, gcc-patches@gnu.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2i X-SW-Source: 2004-06/txt/msg00429.txt.bz2 Hi, the MAKEINFO stuff in Makefile.tpl first tests, if an in-tree makeinfo binary already exists. If yes, it uses it, otherwise it tests the installed makeinfo on the system, if the version is sufficent and depending on the result, it uses the installed makeinfo or it calls "missing". However, this check has a leak when the texinfo directory itself gets built. It creates a makeinfo binary but it doesn't use it since at the time the MAKEINFO test is done, the binary doesn't exist yet. That doesn't make much sense since the makeinfo binary is build before it gets used in texinfo itself. So the idea of the below patch is to always use the self-built makeinfo binary when building in the texinfo subdir. Would that be ok with everyone? If so, I'll check it into sourceware. Corinna * Makefile.tpl (USUAL_MAKEINFO): Always use in-tree makeinfo when building in the texinfo directory. * Makefile.in: Regenerate. Index: Makefile.tpl =================================================================== RCS file: /cvs/src/src/Makefile.tpl,v retrieving revision 1.105 diff -u -p -r1.105 Makefile.tpl --- Makefile.tpl 9 Jun 2004 08:32:33 -0000 1.105 +++ Makefile.tpl 18 Jun 2004 11:19:17 -0000 @@ -273,7 +273,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \ # For an installed makeinfo, we require it to be from texinfo 4.2 or # higher, else we use the "missing" dummy. MAKEINFO=@MAKEINFO@ -USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ +USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] || pwd | grep /texinfo$ > /dev/null ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \ else if (makeinfo --version \ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ Index: Makefile.in =================================================================== RCS file: /cvs/src/src/Makefile.in,v retrieving revision 1.175 diff -u -p -r1.175 Makefile.in --- Makefile.in 9 Jun 2004 08:32:32 -0000 1.175 +++ Makefile.in 18 Jun 2004 11:19:18 -0000 @@ -270,7 +270,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \ # For an installed makeinfo, we require it to be from texinfo 4.2 or # higher, else we use the "missing" dummy. MAKEINFO=@MAKEINFO@ -USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ +USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] || pwd | grep /texinfo$ > /dev/null ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \ else if (makeinfo --version \ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ -- Corinna Vinschen Cygwin Co-Project Leader Red Hat, Inc.