From patchwork Mon Feb  5 09:53:53 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Kovacevic, Marko" <marko.kovacevic@intel.com>
X-Patchwork-Id: 34951
Return-Path: <dev-bounces@dpdk.org>
X-Original-To: patchwork@dpdk.org
Delivered-To: patchwork@dpdk.org
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 2AD361B2FF;
	Mon,  5 Feb 2018 10:54:17 +0100 (CET)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
	by dpdk.org (Postfix) with ESMTP id 3D3F21B2FD;
	Mon,  5 Feb 2018 10:54:15 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga004.jf.intel.com ([10.7.209.38])
	by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
	05 Feb 2018 01:54:14 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.46,464,1511856000"; d="scan'208";a="171721398"
Received: from silpixa00399502.ir.intel.com (HELO
	silpixa00399502.ger.corp.intel.com) ([10.237.223.218])
	by orsmga004.jf.intel.com with ESMTP; 05 Feb 2018 01:54:12 -0800
From: Marko Kovacevic <marko.kovacevic@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, olivier.matz@6wind.com, vipin.varghese@intel.com,
	stable@dpdk.org, Marko Kovacevic <marko.kovacevic@intel.com>
Date: Mon,  5 Feb 2018 09:53:53 +0000
Message-Id: <20180205095353.16245-1-marko.kovacevic@intel.com>
X-Mailer: git-send-email 2.9.5
In-Reply-To: <20180122105905.6996-1-marko.kovacevic@intel.com>
References: <20180122105905.6996-1-marko.kovacevic@intel.com>
Subject: [dpdk-dev] [PATCH v2] mk: support renamed Makefile in external
	project
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
	<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
	<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

The build system made a recursive call to "make" after
creating the build directory. This recursive call used
the hard-coded filename "Makefile", which prevented
builds from working if the file was renamed and make
called using "make -f". Taking the filename from
MAKEFILES_LIST make variable fixes this.

Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org

Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
Acked-by: Vipin Varghese <vipin.varghese@intel.com>
---
V2
 - Changed the call of the make file a litte
   due to an issue reported by Olivier.
---
 mk/internal/rte.extvars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk
index 94f27e9..98c8606 100644
--- a/mk/internal/rte.extvars.mk
+++ b/mk/internal/rte.extvars.mk
@@ -20,7 +20,7 @@ ifeq ("$(origin M)", "command line")
 RTE_EXTMK := $(abspath $(M))
 endif
 endif
-RTE_EXTMK ?= $(RTE_SRCDIR)/Makefile
+RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST)))
 export RTE_EXTMK
 
 # RTE_SDK_BIN must point to .config, include/ and lib/.