aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-07-19 14:39:40 +0200
committerDamjan Marion <dmarion@me.com>2018-07-19 15:24:56 +0000
commit005849ec3426c58b3cc7f16caceb92b4cfeb32b1 (patch)
tree2a212559417b0480a88cc6df9770b891c4ffb55a
parente73b6b7bacb635814b6e47c63e49c60cc5a13bf1 (diff)
Set default STARTUP_DIR to be toplevel dir
Change-Id: I5ccc5f1770ab1f8fb9c4824395f4ee6d48346410 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c1bc849be0b..afbe6f9b45b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
+STARTUP_DIR?=$(PWD)
MACHINE=$(shell uname -m)
SUDO?=sudo
@@ -75,7 +76,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
DEB_DEPENDS += default-jdk-headless
DEB_DEPENDS += libssl1.0-dev
-else
+else
DEB_DEPENDS += default-jdk-headless
DEB_DEPENDS += libssl-dev
endif
@@ -420,7 +421,6 @@ retest:
retest-debug:
$(call test,vpp,vpp_debug,retest)
-STARTUP_DIR ?= $(PWD)
ifeq ("$(wildcard $(STARTUP_CONF))","")
define run
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@@ -451,7 +451,7 @@ run-release:
debug:
$(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
-build-coverity:
+build-coverity:
$(call make,$(PLATFORM)_coverity,install-packages)
debug-release: