diff options
author | Loïc Hoguin <[email protected]> | 2014-12-17 18:35:11 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2014-12-17 18:35:11 +0200 |
commit | 604b98dfa81ba14f2359e5b2933fef00929890b3 (patch) | |
tree | b7a856c09d1d378c282babde645e8f16dde06584 | |
parent | eaf673b79b5b9b2c1d3478cde7ae1c22dfb07192 (diff) | |
download | erlang.mk-604b98dfa81ba14f2359e5b2933fef00929890b3.tar.gz erlang.mk-604b98dfa81ba14f2359e5b2933fef00929890b3.tar.bz2 erlang.mk-604b98dfa81ba14f2359e5b2933fef00929890b3.zip |
Use $(CURDIR) instead of ../$(PROJECT) for SHELL_PATH
This fixes the issue where the project name and project directory
differ, and allow us to support directory of the form name-version.
-rw-r--r-- | erlang.mk | 2 | ||||
-rw-r--r-- | plugins/shell.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1010,7 +1010,7 @@ distclean-relx: # Configuration. -SHELL_PATH ?= -pa ../$(PROJECT)/ebin $(DEPS_DIR)/*/ebin +SHELL_PATH ?= -pa $(CURDIR)/ebin $(DEPS_DIR)/*/ebin SHELL_OPTS ?= ALL_SHELL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(SHELL_DEPS)) diff --git a/plugins/shell.mk b/plugins/shell.mk index 9cbee2e..4e7e97e 100644 --- a/plugins/shell.mk +++ b/plugins/shell.mk @@ -5,7 +5,7 @@ # Configuration. -SHELL_PATH ?= -pa ../$(PROJECT)/ebin $(DEPS_DIR)/*/ebin +SHELL_PATH ?= -pa $(CURDIR)/ebin $(DEPS_DIR)/*/ebin SHELL_OPTS ?= ALL_SHELL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(SHELL_DEPS)) |