From 15ed6df51a45304096329711589e58b1b3e026a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 22 May 2018 17:48:34 +0200 Subject: Update Erlang.mk Includes an experimental change to avoid deleting kerl unnecessarily and/or incorrectly. --- erlang.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'erlang.mk') diff --git a/erlang.mk b/erlang.mk index 0541d58..db5a27e 100644 --- a/erlang.mk +++ b/erlang.mk @@ -17,7 +17,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) export ERLANG_MK_FILENAME -ERLANG_MK_VERSION = 9fff0a1 +ERLANG_MK_VERSION = 2018.05.15-1-g9fff0a1-dirty ERLANG_MK_WITHOUT = # Make 3.81 and 3.82 are deprecated. @@ -216,6 +216,8 @@ ifeq ($(strip $(KERL)),) KERL := $(ERLANG_MK_TMP)/kerl/kerl endif +KERL_DIR = $(ERLANG_MK_TMP)/kerl + export KERL KERL_GIT ?= https://github.com/kerl/kerl @@ -242,7 +244,9 @@ $(KERL_INSTALL_DIR)/$1-native: $(KERL) endif endef -$(KERL): +$(KERL): $(KERL_DIR) + +$(KERL_DIR): $(verbose) mkdir -p $(ERLANG_MK_TMP) $(gen_verbose) git clone --depth 1 $(KERL_GIT) $(ERLANG_MK_TMP)/kerl $(verbose) cd $(ERLANG_MK_TMP)/kerl && git checkout $(KERL_COMMIT) @@ -251,7 +255,7 @@ $(KERL): distclean:: distclean-kerl distclean-kerl: - $(gen_verbose) rm -rf $(KERL) + $(gen_verbose) rm -rf $(KERL_DIR) # Allow users to select which version of Erlang/OTP to use for a project. -- cgit v1.2.3