From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16359 invoked by alias); 6 Oct 2010 23:24:25 -0000 Received: (qmail 16349 invoked by uid 22791); 6 Oct 2010 23:24:24 -0000 X-SWARE-Spam-Status: No, hits=-6.1 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; Wed, 06 Oct 2010 23:24:20 +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 o96NOIDn028330 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Oct 2010 19:24:18 -0400 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 o96NOGtp018106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Oct 2010 19:24:18 -0400 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 o96NOGjF031375; Thu, 7 Oct 2010 01:24:16 +0200 Received: (from jkratoch@localhost) by host1.dyn.jankratochvil.net (8.14.4/8.14.4/Submit) id o96NOF1M031374; Thu, 7 Oct 2010 01:24:15 +0200 Date: Wed, 06 Oct 2010 23:24:00 -0000 From: Jan Kratochvil To: Doug Evans Cc: gdb-patches@sourceware.org Subject: [patch] regression: Fix in-tree build [Re: [patch] Create general staging area for data-directory files.] Message-ID: <20101006232415.GA18635@host1.dyn.jankratochvil.net> References: <20101005001819.ECC65764B8@ruffy.mtv.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101005001819.ECC65764B8@ruffy.mtv.corp.google.com> 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: 2010-10/txt/msg00099.txt.bz2 On Tue, 05 Oct 2010 02:18:19 +0200, Doug Evans wrote: > --- /dev/null 2010-09-23 16:28:04.543730915 -0700 > +++ data-directory/Makefile.in 2010-10-04 16:56:01.000000000 -0700 > +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @frags@ > + cd $(top_builddir) && $(MAKE) data-directory/Makefile -> Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ./config/i386/linux64.mh cd /home/...; ./configure; make [...] make[4]: Entering directory `/home/.../gdb/data-directory' make[4]: *** No rule to make target `config/i386/linux64.mh', needed by `Makefile'. Stop. I will be away for a day, please check it in if it looks OK. Thanks, Jan gdb/ 2010-10-07 Jan Kratochvil * Makefile.in (top_srcdir): New substituted variable. * configure.ac: New variable host_makefile_frag_1. Use $(top_srcdir) prefix for @frags@. * configure: Regenerate. --- ./gdb/Makefile.in 2010-10-06 18:46:12.000000000 +0200 +++ ./gdb/Makefile.in 2010-10-07 00:55:59.000000000 +0200 @@ -97,6 +97,7 @@ POSTCOMPILE = @true # Directory containing source files. srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ YACC=@YACC@ --- ./gdb/configure.ac 2010-10-06 18:02:43.000000000 +0200 +++ ./gdb/configure.ac 2010-10-07 00:57:59.000000000 +0200 @@ -2046,11 +2046,13 @@ AC_SUBST(target_subdir) frags= if test "${gdb_native}" = "yes"; then - host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh + host_makefile_frag_1=config/${gdb_host_cpu}/${gdb_host}.mh + host_makefile_frag=${srcdir}/${host_makefile_frag_1} if test ! -f ${host_makefile_frag}; then AC_MSG_ERROR("*** Gdb does not support native target ${host}") fi - frags="$frags $host_makefile_frag" + # @frags@ may be used in a different subdirectory - use $(top_srcdir). + frags="$frags \$(top_srcdir)/$host_makefile_frag_1" else host_makefile_frag=/dev/null fi