From patchwork Fri Sep 16 19:50:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 115026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4FCE3B70C1 for ; Sat, 17 Sep 2011 05:51:02 +1000 (EST) Received: from localhost ([::1]:56454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4eR9-0000Gs-6a for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 15:50:59 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4eQz-0000D2-8y for qemu-devel@nongnu.org; Fri, 16 Sep 2011 15:50:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4eQx-0007LT-Gn for qemu-devel@nongnu.org; Fri, 16 Sep 2011 15:50:49 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:45043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4eQx-0007L7-CC for qemu-devel@nongnu.org; Fri, 16 Sep 2011 15:50:47 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id AC8FB7281BE8; Fri, 16 Sep 2011 21:50:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N6cCK3CeI6t6; Fri, 16 Sep 2011 21:50:43 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 61B7B7281BF2; Fri, 16 Sep 2011 21:50:43 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Date: Fri, 16 Sep 2011 21:50:43 +0200 Message-Id: <1316202643-29867-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: Anthony Liguori , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Subject: [Qemu-devel] [PATCH] Makefile: Fix broken build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org make -C mybuilddir no longer works (regression caused by commit) 388d475815c23901010a25c845eb078d47ee0740. PWD is the directory of the caller (not mybuilddir), so BUILD_DIR is set to the wrong value. GNU make sets CURDIR to the correct value. Use this macro instead of PWD. Cc: Lluís Vilanova Cc: Anthony Liguori Signed-off-by: Stefan Weil --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 57cc399..a211158 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for QEMU. -# Always point to the root of the build tree -BUILD_DIR=$(PWD) +# Always point to the root of the build tree (needs GNU make). +BUILD_DIR=$(CURDIR) GENERATED_HEADERS = config-host.h trace.h qemu-options.def ifeq ($(TRACE_BACKEND),dtrace)