From b6f30aebfd058560a8cdccefe5212d1016c41c7f Mon Sep 17 00:00:00 2001 From: Thomas Moulia Date: Wed, 11 Jun 2014 13:20:50 -0700 Subject: fixed setting `RELX_OUTPUT_DIR` from `RELX_OPTS` This fix is imperfect: it only works if `-o $DIR` are the first args in `RELX_OPTS`. It does not implicitly set the `RELX_OUTPUT_DIR` when there is an arg other than `-o`, e.g. `--dev-mode`, leading `RELX_OPTS`. --- plugins/relx.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/relx.mk') diff --git a/plugins/relx.mk b/plugins/relx.mk index c6fd227..f425d12 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -16,8 +16,8 @@ RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx RELX_OPTS ?= RELX_OUTPUT_DIR ?= _rel -ifneq ($(firstword $(subst -o,,$(RELX_OPTS))),) - RELX_OUTPUT_DIR = $(firstword $(subst -o,,$(RELX_OPTS))) +ifeq ($(firstword $(RELX_OPTS)),-o) + RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS)) endif # Core targets. -- cgit v1.2.3