Tweaks

Author: lhoguin

deps/rabbitmq_cli/Makefile

@@ -157,7 +157,7 @@ dialyzer:: escript
 
 .PHONY: install
 
-install: escript
+install: $(ESCRIPT_FILE)
 ifdef PREFIX
 	$(gen_verbose) mkdir -p "$(DESTDIR)$(PREFIX)"
 	$(verbose) $(foreach script,$(ACTUAL_ESCRIPTS), \

erlang.mk

@@ -1800,7 +1800,7 @@ export ELIXIR
 ifeq ($(ELIXIR),system)
 # We expect 'elixir' to be on the path.
 # @todo Only if there are EX_FILES
-ELIXIR_LIBS ?= $(dir $(shell elixir -e 'IO.puts(:code.lib_dir(:elixir))'))
+ELIXIR_LIBS ?= $(dir $(shell readlink -f `which elixir`))/../lib
 ELIXIR_LIBS := $(ELIXIR_LIBS)
 export ELIXIR_LIBS
 ERL_LIBS := $(ERL_LIBS):$(ELIXIR_LIBS)