From 7c2ad9e3be54368f241e85df92bea261235bf242 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Fri, 17 Nov 2017 14:28:44 -0700
Subject: [PATCH] config: default CONFIG_DPDK_DIR to dpdk submodule

This allows 'make' without 'configure' to work out of the box if the
user has already updated the dpdk submodule.

Using 'configure' is still the recommended way to build SPDK.

Change-Id: I59fda03197939a745d2ed92b4d15ae0d7d8cdba5
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/388053
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 CONFIG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONFIG b/CONFIG
index 13e930203..47c5430d1 100644
--- a/CONFIG
+++ b/CONFIG
@@ -60,7 +60,7 @@ CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk
 # installation. Alternatively you can specify this on the command line
 # with 'make DPDK_DIR=/path/to/dpdk'. This is only a valid entry
 # when using the default SPDK environment library.
-CONFIG_DPDK_DIR?=/path/to/dpdk
+CONFIG_DPDK_DIR?=$(SPDK_ROOT_DIR)/dpdk/build
 
 # Build SPDK FIO plugin. Requires FIO_SOURCE_DIR set to a valid
 # fio source code directory.