diff options
| author | Thomas Moulia <[email protected]> | 2014-06-11 13:20:50 -0700 |
|---|---|---|
| committer | Thomas Moulia <[email protected]> | 2014-06-11 13:20:50 -0700 |
| commit | b6f30aebfd058560a8cdccefe5212d1016c41c7f (patch) | |
| tree | 2f749212d38961860c2bf428dc87f7df08a42939 | |
| parent | cbda6e436d792b7db0ef097afb200a3e69326647 (diff) | |
| download | erlang.mk-b6f30aebfd058560a8cdccefe5212d1016c41c7f.tar.gz erlang.mk-b6f30aebfd058560a8cdccefe5212d1016c41c7f.tar.bz2 erlang.mk-b6f30aebfd058560a8cdccefe5212d1016c41c7f.zip | |
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`.
| -rw-r--r-- | plugins/relx.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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. |