public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: Doug Evans <dje@google.com>
Cc: gdb-patches@sourceware.org
Subject: [patch] regression: Fix in-tree build  [Re: [patch] Create general staging area for data-directory files.]
Date: Wed, 06 Oct 2010 23:24:00 -0000	[thread overview]
Message-ID: <20101006232415.GA18635@host1.dyn.jankratochvil.net> (raw)
In-Reply-To: <20101005001819.ECC65764B8@ruffy.mtv.corp.google.com>

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  <jan.kratochvil@redhat.com>

	* 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

  reply	other threads:[~2010-10-06 23:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-05  0:18 [patch] Create general staging area for data-directory files Doug Evans
2010-10-06 23:24 ` Jan Kratochvil [this message]
2010-10-06 23:34   ` [patch] regression: Fix in-tree build [Re: [patch] Create general staging area for data-directory files.] Pedro Alves
2010-10-07  0:05     ` Doug Evans
2010-10-07  0:21       ` Doug Evans

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101006232415.GA18635@host1.dyn.jankratochvil.net \
    --to=jan.kratochvil@redhat.com \
    --cc=dje@google.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).