diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-01-02 17:28:25 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-01-02 17:28:25 +0000 |
commit | d96e47a5076343abc4ae7d52dbd2fed908e2daec (patch) | |
tree | ad9785443e33efb982e28c7f87e75f7d0c8d2e0c /Makefile | |
parent | 79fcfa572b7834f7768fa2fedb954059e47791f3 (diff) | |
download | gitano-d96e47a5076343abc4ae7d52dbd2fed908e2daec.tar.gz |
Add overrides so that when you specify YARN_ARGS we still build the extra bits
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |