diff options
| author | Loïc Hoguin <[email protected]> | 2014-08-20 16:06:57 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-08-20 16:08:25 +0300 |
| commit | 5d021bf639417c663c8d68636e89952598c51368 (patch) | |
| tree | 68609b664784441e1e5b10542e9d6d14d48e1745 | |
| parent | e89e4208263350f11b5ede9eae1e809401ca05af (diff) | |
| download | erlang.mk-5d021bf639417c663c8d68636e89952598c51368.tar.gz erlang.mk-5d021bf639417c663c8d68636e89952598c51368.tar.bz2 erlang.mk-5d021bf639417c663c8d68636e89952598c51368.zip | |
Correctly handle RELX_OUTPUT_DIR1.1.0
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | erlang.mk | 2 | ||||
| -rw-r--r-- | plugins/relx.mk | 2 |
3 files changed, 9 insertions, 0 deletions
@@ -322,6 +322,11 @@ You can change the generated releases location by setting the `RELX_OUTPUT_DIR` variable. Any other option should go in the `RELX_OPTS` variable. +If `RELX_OPTS` includes the `-o` option (instead of using +`RELX_OUTPUT_DIR`, then that option must be the first in +the list, otherwise erlang.mk will fail to find it and +will not be able to clean up the release directory. + Contributing ------------ @@ -709,6 +709,8 @@ RELX_OUTPUT_DIR ?= _rel ifeq ($(firstword $(RELX_OPTS)),-o) RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS)) +else + RELX_OPTS += -o $(RELX_OUTPUT_DIR) endif # Core targets. diff --git a/plugins/relx.mk b/plugins/relx.mk index 3204321..ee226d3 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -16,6 +16,8 @@ RELX_OUTPUT_DIR ?= _rel ifeq ($(firstword $(RELX_OPTS)),-o) RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS)) +else + RELX_OPTS += -o $(RELX_OUTPUT_DIR) endif # Core targets. |