From d96e47a5076343abc4ae7d52dbd2fed908e2daec Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 2 Jan 2017 17:28:25 +0000 Subject: Add overrides so that when you specify YARN_ARGS we still build the extra bits --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 92ae6b1..10798b0 100644 --- a/Makefile +++ b/Makefile @@ -171,19 +171,19 @@ install-plugins: install -m 644 $$LANGFILE $(DESTDIR)$(INST_ROOT)/lib/gitano/plugins; \ done -YARN_ARGS ?= +override YARN_ARGS := $(YARN_ARGS) ifneq ($(LUA_PATH),) -YARN_ARGS += --env LUA_PATH="$(LUA_PATH)" +override YARN_ARGS += --env LUA_PATH="$(LUA_PATH)" endif ifneq ($(LUA_CPATH),) -YARN_ARGS += --env LUA_CPATH="$(LUA_CPATH)" +override YARN_ARGS += --env LUA_CPATH="$(LUA_CPATH)" endif ifneq ($(SCENARIO),) -YARN_ARGS += --run "$(SCENARIO)" +override YARN_ARGS += --run "$(SCENARIO)" endif ifneq ($(YARN_SNAPSHOT),) -YARN_ARGS += --snapshot +override YARN_ARGS += --snapshot endif TEST_PROTO ?= ssh -- cgit v1.2.1