aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-07-20 15:24:46 +0200
committerLoïc Hoguin <[email protected]>2014-07-20 15:24:46 +0200
commite281311f7d08dabf969cf1fd0b5f35f8788c1c9d (patch)
treedf443e23f46cf0e64b652e5fb68261ad9b2d0a12
parent0dc1feba668a4e86d4b2a4bb4bcb40a48822490a (diff)
parentb6f30aebfd058560a8cdccefe5212d1016c41c7f (diff)
downloaderlang.mk-e281311f7d08dabf969cf1fd0b5f35f8788c1c9d.tar.gz
erlang.mk-e281311f7d08dabf969cf1fd0b5f35f8788c1c9d.tar.bz2
erlang.mk-e281311f7d08dabf969cf1fd0b5f35f8788c1c9d.zip
Merge branch 'relx-output-dir-fix' of git://github.com/jtmoulia/erlang.mk
-rw-r--r--plugins/relx.mk4
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.